X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FSDCCmain.c;h=308175e216eb28a4500b6d638e7e0b7e29ae43a6;hb=c5dd54fc9cd74791c107449b41b587ff75b4ebd4;hp=1d544f7bc9b8777cd38d7e782b8ad12f357c66b5;hpb=9fb5d31c8ad6171c55274cbfb4fced6e6f242aeb;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 1d544f7b..308175e2 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -22,6 +22,7 @@ what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ +#include #include "common.h" #include #include "newalloc.h" @@ -50,9 +51,10 @@ extern int yyparse (); FILE *srcFile; /* source file */ FILE *cdbFile = NULL; /* debugger information output file */ char *fullSrcFileName; /* full name for the source file; */ - /* can be NULL while linking without compiling */ + /* can be NULL while c1mode or linking without compiling */ char *fullDstFileName; /* full name for the output file; */ /* only given by -o, otherwise NULL */ +size_t fullDstFileNameLen; /* size of previous string. */ char *dstFileName; /* destination file name without extension */ char *dstPath = ""; /* path for the output files; */ /* "" is equivalent with cwd */ @@ -74,9 +76,6 @@ char *libPaths[128]; int nlibPaths = 0; char *relFiles[128]; int nrelFiles = 0; -bool verboseExec = FALSE; -char *preOutName; -bool noXinitOpt = FALSE; /* uncomment JAMIN_DS390 to always override and use ds390 port for mcs51 work. This is temporary, for compatibility testing. */ @@ -87,7 +86,7 @@ int ds390_jammed = 0; // Globally accessible scratch buffer for file names. char scratchFileName[PATH_MAX]; -char buffer[PATH_MAX]; +char buffer[PATH_MAX * 2]; // In MSC VC6 default search path for exe's to path for this @@ -115,6 +114,7 @@ char DefaultExePath[128]; #define OPTION_DATA_LOC "--data-loc" #define OPTION_CODE_LOC "--code-loc" #define OPTION_IDATA_LOC "--idata-loc" +#define OPTION_NO_LABEL_OPT "--nolabelopt" #define OPTION_NO_LOOP_INV "--noinvariant" #define OPTION_NO_LOOP_IND "--noinduction" #define OPTION_LESS_PEDANTIC "--lesspedantic" @@ -124,8 +124,10 @@ char DefaultExePath[128]; #define OPTION_NO_XINIT_OPT "--no-xinit-opt" #define OPTION_XRAM_SIZE "--xram-size" #define OPTION_CODE_SIZE "--code-size" +#define OPTION_NO_CCODE_IN_ASM "--no-c-code-in-asm" +#define OPTION_ICODE_IN_ASM "--i-code-in-asm" -static const OPTION +static const OPTION optionsTable[] = { { 'm', NULL, NULL, "Set the port to use e.g. -mz80." }, { 'p', NULL, NULL, "Select port specific processor e.g. -mpic14 -p16f84" }, @@ -136,7 +138,7 @@ optionsTable[] = { { 'U', NULL, NULL, NULL }, { 'C', NULL, NULL, "Preprocessor option" }, { 'M', NULL, NULL, "Preprocessor option" }, - { 'V', NULL, &verboseExec, "Execute verbosely. Show sub commands as they are run" }, + { 'V', NULL, &options.verboseExec, "Execute verbosely. Show sub commands as they are run" }, { 'S', NULL, &noAssemble, "Compile only; do not assemble or link" }, { 'W', NULL, NULL, "Pass through options to the pre-processor (p), assembler (a) or linker (l)" }, { 'L', NULL, NULL, "Add the next field to the library search path" }, @@ -150,6 +152,7 @@ optionsTable[] = { { 0, "--stack-10bit", &options.stack10bit, "use the 10bit stack for ds390 (default)" }, { 0, "--xstack", &options.useXstack, "Use external stack" }, { 0, OPTION_NO_GCSE, NULL, "Disable the GCSE optimisation" }, + { 0, OPTION_NO_LABEL_OPT, NULL, "Disable label optimisation" }, { 0, OPTION_NO_LOOP_INV, NULL, "Disable optimisation of invariants" }, { 0, OPTION_NO_LOOP_IND, NULL, NULL }, { 0, "--nojtbound", &optimize.noJTabBoundary, "Don't generate boundary check for jump tables" }, @@ -190,7 +193,7 @@ optionsTable[] = { { 0, "--debug", &options.debug, "Enable debugging symbol output" }, { 'v', OPTION_VERSION, NULL, "Display sdcc's version" }, { 'E', "--preprocessonly", &preProcOnly, "Preprocess only, do not compile" }, - { 0, "--c1mode", &options.c1mode, "Act in c1 mode. The input is preprocessed code, the output is assembly code." }, + { 0, "--c1mode", &options.c1mode, "Act in c1 mode. The standard input is preprocessed code, the output is assembly code." }, { 0, "--help", NULL, "Display this help" }, { 0, OPTION_CALLEE_SAVES, NULL, " Cause the called function to save registers insted of the caller" }, { 0, "--nostdlib", &options.nostdlib, "Do not include the standard library directory in the search path" }, @@ -206,7 +209,9 @@ optionsTable[] = { { 0, "--tini-libid", NULL," LibraryID used in -mTININative"}, { 0, "--protect-sp-update", &options.protect_sp_update,"DS390 - will disable interrupts during ESP:SP updates"}, { 0, "--parms-in-bank1", &options.parms_in_bank1,"MCS51/DS390 - use Bank1 for parameter passing"}, - { 0, OPTION_NO_XINIT_OPT, &noXinitOpt, "don't memcpy initialized xram from code"}, + { 0, OPTION_NO_XINIT_OPT, &options.noXinitOpt, "don't memcpy initialized xram from code"}, + { 0, OPTION_NO_CCODE_IN_ASM, &options.noCcodeInAsm, "don't include c-code as comments in the asm file"}, + { 0, OPTION_ICODE_IN_ASM, &options.iCodeInAsm, "include i-code as comments in the asm file"}, /* End of options */ { 0, NULL } }; @@ -387,16 +392,14 @@ printVersionInfo () " (CYGWIN)\n" #elif defined __MINGW32__ " (MINGW32) \n" -#else -# ifdef __DJGPP__ +#elif defined __DJGPP__ " (DJGPP) \n" -# else -# if defined(_MSC_VER) - " (WIN32) \n" -# else +#elif defined(_MSC_VER) + " (MSVC) \n" +#elif defined(__BORLANDC__) + " (BORLANDC) \n" +#else " (UNIX) \n" -# endif -# endif #endif ,VersionString @@ -430,7 +433,7 @@ printUsage () "Usage : sdcc [options] filename\n" "Options :-\n" ); - + printOptions(optionsTable); for (i = 0; i < NUM_PORTS; i++) @@ -537,7 +540,7 @@ processFile (char *s) } /* otherwise depending on the file type */ - if (strcmp (fext, ".c") == 0 || strcmp (fext, ".C") == 0 || options.c1mode) + if (strcmp (fext, ".c") == 0 || strcmp (fext, ".C") == 0) { /* source file name : not if we already have a source file */ @@ -556,7 +559,7 @@ processFile (char *s) } /* copy the file name into the buffer */ - strcpy (buffer, s); + strncpyz (buffer, s, sizeof(buffer)); /* get rid of the "."-extension */ @@ -691,7 +694,10 @@ tryHandleUnsupportedOpt(char **argv, int *pi) (longOpt && unsupportedOptTable[i].longOpt && !strcmp(unsupportedOptTable[i].longOpt, longOpt))) { // Found an unsupported opt. char buffer[100]; - sprintf(buffer, "%s%c%c", longOpt ? longOpt : "", shortOpt ? '-' : ' ', shortOpt ? shortOpt : ' '); + SNPRINTF(buffer, sizeof(buffer), + "%s%c%c", + longOpt ? longOpt : "", + shortOpt ? '-' : ' ', shortOpt ? shortOpt : ' '); werror (W_UNSUPP_OPTION, buffer, unsupportedOptTable[i].message); return 1; } @@ -950,6 +956,12 @@ parseCmdLine (int argc, char **argv) continue; } + if (strcmp (argv[i], OPTION_NO_LABEL_OPT) == 0) + { + optimize.label4 = 0; + continue; + } + if (strcmp (argv[i], OPTION_NO_LOOP_IND) == 0) { optimize.loopInduction = 0; @@ -1025,7 +1037,8 @@ parseCmdLine (int argc, char **argv) char *p; /* copy the file name into the buffer */ - strcpy (buffer, getStringArg("-o", argv, &i, argc)); + strncpyz(buffer, getStringArg("-o", argv, &i, argc), + sizeof(buffer)); /* point to last character */ p = buffer + strlen (buffer) - 1; if (*p == DIR_SEPARATOR_CHAR) @@ -1037,6 +1050,7 @@ parseCmdLine (int argc, char **argv) else { fullDstFileName = Safe_strdup (buffer); + fullDstFileNameLen = strlen(fullDstFileName) + 1; /* get rid of the "."-extension */ @@ -1130,7 +1144,7 @@ parseCmdLine (int argc, char **argv) if (sOpt == 'Y') sOpt = 'I'; - sprintf (buffer, "-%c%s", sOpt, rest); + SNPRINTF (buffer, sizeof(buffer), "-%c%s", sOpt, rest); addToList (preArgv, buffer); } break; @@ -1144,27 +1158,68 @@ parseCmdLine (int argc, char **argv) if (!port->parseOption (&argc, argv, &i)) { - /* no option must be a filename */ - processFile (argv[i]); + /* no option must be a filename */ + if (options.c1mode) + { + werror (W_NO_FILE_ARG_IN_C1, argv[i]); + } + else + { + processFile (argv[i]); + } } } + /* some sanity checks in c1 mode */ + if (options.c1mode) + { + int i; + + if (fullSrcFileName) + { + fclose (srcFile); + werror (W_NO_FILE_ARG_IN_C1, fullSrcFileName); + } + fullSrcFileName = NULL; + for (i = 0; i < nrelFiles; ++i) + { + werror (W_NO_FILE_ARG_IN_C1, relFiles[i]); + } + for (i = 0; i < nlibFiles; ++i) + { + werror (W_NO_FILE_ARG_IN_C1, libFiles[i]); + } + nrelFiles = nlibFiles = 0; + if (options.cc_only || noAssemble || preProcOnly) + { + werror (W_ILLEGAL_OPT_COMBINATION); + } + options.cc_only = noAssemble = preProcOnly = 0; + if (!dstFileName) + { + werror (E_NEED_OPT_O_IN_C1); + exit (1); + } + } /* if no dstFileName given with -o, we've to find one: */ if (!dstFileName) { /* use the modulename from the C-source */ if (fullSrcFileName) { - dstFileName = Safe_alloc (strlen (dstPath) + strlen (moduleName) + 1); - strcpy (dstFileName, dstPath); - strcat (dstFileName, moduleName); + size_t bufSize = strlen (dstPath) + strlen (moduleName) + 1; + + dstFileName = Safe_alloc (bufSize); + strncpyz (dstFileName, dstPath, bufSize); + strncatz (dstFileName, moduleName, bufSize); } /* use the modulename from the first object file */ else if (nrelFiles >= 1) { char *objectName; + size_t bufSize; - strcpy (buffer, relFiles[0]); + strncpyz (buffer, relFiles[0], sizeof(buffer)); /* remove extension (it must be .rel) */ *strrchr (buffer, '.') = '\0'; /* remove path */ @@ -1177,9 +1232,10 @@ parseCmdLine (int argc, char **argv) { objectName = buffer; } - dstFileName = Safe_alloc (strlen (dstPath) + strlen (objectName) + 1); - strcpy (dstFileName, dstPath); - strcat (dstFileName, objectName); + bufSize = strlen (dstPath) + strlen (objectName) + 1; + dstFileName = Safe_alloc (bufSize); + strncpyz (dstFileName, dstPath, bufSize); + strncatz (dstFileName, objectName, bufSize); } /* else no module given: help text is displayed */ } @@ -1191,7 +1247,8 @@ parseCmdLine (int argc, char **argv) /* if debug option is set the open the cdbFile */ if (options.debug && fullSrcFileName) { - sprintf (scratchFileName, "%s.adb", dstFileName); //JCF: Nov 30, 2002 + SNPRINTF (scratchFileName, sizeof(scratchFileName), + "%s.adb", dstFileName); //JCF: Nov 30, 2002 if ((cdbFile = fopen (scratchFileName, "w")) == NULL) werror (E_FILE_OPEN_ERR, scratchFileName); else @@ -1214,7 +1271,8 @@ linkEdit (char **envp) int i, system_ret; /* first we need to create the .lnk file */ - sprintf (scratchFileName, "%s.lnk", dstFileName); + SNPRINTF (scratchFileName, sizeof(scratchFileName), + "%s.lnk", dstFileName); if (!(lnkfile = fopen (scratchFileName, "w"))) { werror (E_FILE_OPEN_ERR, scratchFileName); @@ -1346,33 +1404,35 @@ linkEdit (char **envp) /* -o option overrides default name? */ if (fullDstFileName) { - strcpy (scratchFileName, fullDstFileName); + strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName)); } else { /* the linked file gets the name of the first modul */ if (fullSrcFileName) { - strcpy (scratchFileName, dstFileName); + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); } else { - strcpy (scratchFileName, relFiles[0]); + strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName)); /* strip ".rel" extension */ *strrchr (scratchFileName, '.') = '\0'; } - strcat (scratchFileName, options.out_fmt ? ".S19" : ".ihx"); + strncatz (scratchFileName, + options.out_fmt ? ".S19" : ".ihx", + sizeof(scratchFileName)); } if (port->linker.cmd) { char buffer2[PATH_MAX]; buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, NULL); - buildCmdLine2 (buffer, buffer2); + buildCmdLine2 (buffer, buffer2, sizeof(buffer)); } else { - buildCmdLine2 (buffer, port->linker.mcmd); + buildCmdLine2 (buffer, port->linker.mcmd, sizeof(buffer)); } system_ret = my_system (buffer); @@ -1384,16 +1444,24 @@ linkEdit (char **envp) /* the linked file gets the name of the first modul */ if (fullSrcFileName) { - strcpy (scratchFileName, dstFileName); + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); p = strlen (scratchFileName) + scratchFileName; } else { - strcpy (scratchFileName, relFiles[0]); + strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName)); /* strip "rel" extension */ - p = strrchr (scratchFileName, '.') + 1; + p = strrchr (scratchFileName, '.'); + if (p) + { + p++; + *p = 0; + } + } - strcpy (p, options.out_fmt ? "S19" : "ihx"); + strncatz (scratchFileName, + options.out_fmt ? "S19" : "ihx", + sizeof(scratchFileName)); rename (scratchFileName, fullDstFileName); q = strrchr (fullDstFileName, '.'); @@ -1405,13 +1473,19 @@ linkEdit (char **envp) else { /* no extension: append new extensions */ + /* Don't we want to append a period here ? */ q = strlen (fullDstFileName) + fullDstFileName; } - strcpy (p, "map"); - strcpy (q, "map"); + + *p = 0; + strncatz (scratchFileName, "map", sizeof(scratchFileName)); + *q = 0; + strncatz(fullDstFileName, "map", fullDstFileNameLen); rename (scratchFileName, fullDstFileName); - strcpy (p, "mem"); - strcpy (q, "mem"); + *p = 0; + strncatz (scratchFileName, "mem", sizeof(scratchFileName)); + *q = 0; + strncatz(fullDstFileName, "mem", fullDstFileNameLen); rename (scratchFileName, fullDstFileName); } if (system_ret) @@ -1430,11 +1504,12 @@ assemble (char **envp) /* -o option overrides default name? */ if (options.cc_only && fullDstFileName) { - strcpy (scratchFileName, fullDstFileName); + strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName)); } else { /* the assembled file gets the name of the first modul */ - strcpy (scratchFileName, dstFileName); - strcat (scratchFileName, port->linker.rel_ext); + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); + strncatz (scratchFileName, port->linker.rel_ext, + sizeof(scratchFileName)); } if (port->assembler.do_assemble) { @@ -1445,7 +1520,7 @@ assemble (char **envp) options.debug ? port->assembler.debug_opts : port->assembler.plain_opts, asmOptions); } else { - buildCmdLine2 (buffer, port->assembler.mcmd); + buildCmdLine2 (buffer, port->assembler.mcmd, sizeof(buffer)); } if (my_system (buffer)) { @@ -1457,8 +1532,10 @@ assemble (char **envp) /* TODO: most assembler don't have a -o parameter */ /* -o option overrides default name? */ if (options.cc_only && fullDstFileName) { - strcpy (scratchFileName, dstFileName); - strcat (scratchFileName, port->linker.rel_ext); + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); + strncatz (scratchFileName, + port->linker.rel_ext, + sizeof(scratchFileName)); rename (scratchFileName, fullDstFileName); } } @@ -1469,9 +1546,11 @@ assemble (char **envp) static int preProcess (char **envp) { - preOutName = NULL; - - if (!options.c1mode) + if (options.c1mode) + { + yyin = stdin; + } + else { /* if using external stack define the macro */ if (options.useXstack) @@ -1526,49 +1605,36 @@ preProcess (char **envp) setMainValue ("cppextraopts", join(preArgv)); - if (preProcOnly) - { - if (fullDstFileName) - preOutName = Safe_strdup (fullDstFileName); - } + if (preProcOnly && fullDstFileName) + { + /* -E and -o given */ + setMainValue ("cppoutfilename", fullDstFileName); + } else - preOutName = Safe_strdup (tempfilename ()); - - /* Have to set cppoutfilename to something, even if just pre-processing. */ - setMainValue ("cppoutfilename", preOutName ? preOutName : ""); + { + /* Have to set cppoutfilename to something, even if piping */ + setMainValue ("cppoutfilename", ""); + } if (options.verbose) printf ("sdcc: Calling preprocessor...\n"); - buildCmdLine2 (buffer, _preCmd); + buildCmdLine2 (buffer, _preCmd, sizeof(buffer)); - if (my_system (buffer)) - { - // @FIX: Dario Vecchio 03-05-2001 - if (preOutName) - { - unlink (preOutName); - Safe_free (preOutName); - } - // EndFix + if (preProcOnly) { + if (my_system (buffer)) { exit (1); } - if (preProcOnly) - { - exit (0); + exit (0); } - } - else - { - preOutName = fullSrcFileName; - } - yyin = fopen (preOutName, "r"); - if (yyin == NULL) - { - perror ("Preproc file not found\n"); - exit (1); + yyin = my_popen (buffer); + if (yyin == NULL) { + perror ("Preproc file not found"); + exit (1); + } + addSetHead (&pipeSet, yyin); } return 0; @@ -1583,8 +1649,8 @@ _setPaths (const char *pprefix) where expected. If so, set. */ getPathDifference (buffer, PREFIX, SDCC_INCLUDE_DIR); - strcpy (scratchFileName, pprefix); - strcat (scratchFileName, buffer); + strncpyz (scratchFileName, pprefix, sizeof(scratchFileName)); + strncatz (scratchFileName, buffer, sizeof(scratchFileName)); if (pathExists (scratchFileName)) { @@ -1596,8 +1662,8 @@ _setPaths (const char *pprefix) } getPathDifference (buffer, PREFIX, SDCC_LIB_DIR); - strcpy (scratchFileName, pprefix); - strcat (scratchFileName, buffer); + strncpyz (scratchFileName, pprefix, sizeof(scratchFileName)); + strncatz (scratchFileName, buffer, sizeof(scratchFileName)); if (pathExists (scratchFileName)) { @@ -1641,7 +1707,7 @@ _discoverPaths (const char *argv0) */ if (strchr (argv0, DIR_SEPARATOR_CHAR)) { - strcpy (scratchFileName, argv0); + strncpyz (scratchFileName, argv0, sizeof(scratchFileName)); *strrchr (scratchFileName, DIR_SEPARATOR_CHAR) = '\0'; setMainValue ("bindir", scratchFileName); ExePathList[0] = Safe_strdup (scratchFileName); @@ -1649,8 +1715,8 @@ _discoverPaths (const char *argv0) else if (getenv (SDCCDIR_NAME) != NULL) { getPathDifference (buffer, PREFIX, BINDIR); - strcpy (scratchFileName, getenv (SDCCDIR_NAME)); - strcat (scratchFileName, buffer); + strncpyz (scratchFileName, getenv (SDCCDIR_NAME), sizeof(scratchFileName)); + strncatz (scratchFileName, buffer, sizeof(scratchFileName)); setMainValue ("bindir", scratchFileName); ExePathList[0] = Safe_strdup (scratchFileName); } @@ -1660,7 +1726,7 @@ _discoverPaths (const char *argv0) ExePathList[0] = BINDIR; } - do + do { /* Case 1 */ if (getenv (SDCCDIR_NAME) != NULL) @@ -1713,7 +1779,7 @@ initValues (void) setMainValue ("dstfilename", dstFileName); setMainValue ("fullsrcfilename", fullSrcFileName ? fullSrcFileName : "fullsrcfilename"); - + if (options.cc_only && fullDstFileName) /* compile + assemble and -o given: -o specifies name of object file */ { @@ -1735,6 +1801,33 @@ initValues (void) } +static void +sig_handler (int signal) +{ + char *sig_string; + + switch (signal) + { + case SIGABRT: + sig_string = "SIGABRT"; + break; + case SIGTERM: + sig_string = "SIGTERM"; + break; + case SIGINT: + sig_string = "SIGINT"; + break; + case SIGSEGV: + sig_string = "SIGSEGV"; + break; + default: + sig_string = "Unknown?"; + break; + } + fprintf (stderr, "Caught signal %d: %s\n", signal, sig_string); + exit (1); +} + /* * main routine * initialises and calls the parser @@ -1756,7 +1849,17 @@ main (int argc, char **argv, char **envp) /* install atexit handler */ atexit(rm_tmpfiles); - /* Before parsing the command line options, do a + /* install signal handler; + it's only purpuse is to call exit() to remove temp files */ + if (!getenv("SDCC_LEAVE_SIGNALS")) + { + signal (SIGABRT, sig_handler); + signal (SIGTERM, sig_handler); + signal (SIGINT , sig_handler); + signal (SIGSEGV, sig_handler); + } + + /* Before parsing the command line options, do a * search for the port and processor and initialize * them if they're found. (We can't gurantee that these * will be the first options specified). @@ -1791,8 +1894,7 @@ main (int argc, char **argv, char **envp) parseCmdLine (argc, argv); /* if no input then printUsage & exit */ - if ((!options.c1mode && !fullSrcFileName && !nrelFiles) || - (options.c1mode && !fullSrcFileName)) + if (!options.c1mode && !fullSrcFileName && !nrelFiles) { printUsage (); exit (0); @@ -1808,7 +1910,7 @@ main (int argc, char **argv, char **envp) initMem (); port->finaliseOptions (); - if (fullSrcFileName) + if (fullSrcFileName || options.c1mode) { preProcess (envp); @@ -1823,16 +1925,11 @@ main (int argc, char **argv, char **envp) yyparse (); + pclose(yyin); + deleteSetItem(&pipeSet, yyin); + if (fatalError) { - // @FIX: Dario Vecchio 03-05-2001 - if (preOutName) { - if (yyin && yyin != stdin) - fclose (yyin); - unlink (preOutName); - Safe_free (preOutName); - } - // EndFix - return 1; + exit (1); } if (TARGET_IS_PIC) { @@ -1856,21 +1953,11 @@ main (int argc, char **argv, char **envp) assemble (envp); } } - closeDumpFiles(); if (cdbFile) fclose (cdbFile); - if (yyin && yyin != stdin) - fclose (yyin); - - if (preOutName && !options.c1mode) - { - unlink (preOutName); - Safe_free (preOutName); - } - if (!options.cc_only && !fatalError && !noAssemble &&