X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=3573c6bb7aafb34d3ee83421bb5f0dd6311bb7cb;hb=a459416b8ccfbc72b21ea4053f68bf2c69a747e2;hp=6451241d567f997e34d90608470c7e7f8d902a4b;hpb=e9beab23defafa9f8504bb7fa175dda455b7765b;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 6451241d..3573c6bb 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -28,6 +28,8 @@ #include "SDCCerr.h" #include "BuildCmd.h" #include "MySystem.h" +#include "SDCCmacro.h" +#include "SDCCutil.h" #if NATIVE_WIN32 #include @@ -36,9 +38,13 @@ #endif #if !defined(__BORLANDC__) && !defined(_MSC_VER) +#include #include #endif +/** Name of the environment variable checked for other instalations. */ +#define SDCCDIR_NAME "SDCCDIR" + //REMOVE ME!!! extern int yyparse (); @@ -65,8 +71,16 @@ int nrelFiles = 0; bool verboseExec = FALSE; char *preOutName; +/* uncomment JAMIN_DS390 to always override and use ds390 port + for mcs51 work. This is temporary, for compatibility testing. */ +/* #define JAMIN_DS390 */ +#ifdef JAMIN_DS390 +int ds390_jammed = 0; +#endif + // Globally accessible scratch buffer for file names. char scratchFileName[FILENAME_MAX]; +char buffer[FILENAME_MAX]; // In MSC VC6 default search path for exe's to path for this @@ -131,7 +145,7 @@ optionsTable[] = { { 'C', NULL, NULL, "Preprocessor option" }, { 'M', NULL, NULL, "Preprocessor option" }, { 'V', NULL, &verboseExec, "Execute verbosely. Show sub commands as they are run" }, - { 'S', NULL, &noAssemble, "Assemble only" }, + { 'S', NULL, &noAssemble, "Compile only; do not assemble or link" }, { 'W', NULL, NULL, "Pass through options to the assembler (a) or linker (l)" }, { 'L', NULL, NULL, "Add the next field to the library search path" }, { 'l', NULL, NULL, "Include the given library in the link" }, @@ -149,7 +163,7 @@ optionsTable[] = { { 0, OPTION_NO_LOOP_IND, NULL, NULL }, { 0, "--nojtbound", &optimize.noJTabBoundary, "Don't generate boundary check for jump tables" }, { 0, "--noloopreverse", &optimize.noLoopReverse, "Disable the loop reverse optimisation" }, - { 'c', "--compile-only", &options.cc_only, "Compile only, do not assemble or link" }, + { 'c', "--compile-only", &options.cc_only, "Compile and assemble, but do not link" }, { 0, "--dumpraw", &options.dump_raw, "Dump the internal structure after the initial parse" }, { 0, "--dumpgcse", &options.dump_gcse, NULL }, { 0, "--dumploop", &options.dump_loop, NULL }, @@ -188,7 +202,8 @@ optionsTable[] = { { 0, "--nostdinc", &options.nostdinc, "Do not include the standard include directory in the search path" }, { 0, "--verbose", &options.verbose, "Trace calls to the preprocessor, assembler, and linker" }, { 0, OPTION_LESS_PEDANTIC, NULL, "Disable some of the more pedantic warnings" }, - { 0, OPTION_SHORT_IS_8BITS, NULL, "Make short 8bits (for old times sake)" } + { 0, OPTION_SHORT_IS_8BITS, NULL, "Make short 8bits (for old times sake)" }, + { 0, "--profile", &options.profile, "On supported ports, generate extra profiling information" } }; /** Table of all unsupported options and help text to display when one @@ -218,12 +233,18 @@ unsupportedOptTable[] = { { 'Y', NULL, "use -I instead" } }; -static const char *_preCmd[] = -{ - "sdcpp", "-Wall", "-lang-c++", "-DSDCC=1", - "$l", "$1", "$2", NULL +/** List of all default constant macros. + */ +static const char *_baseValues[] = { + "cpp", "{bindir}{sep}sdcpp", + "cppextraopts", "", + /* Path seperator character */ + "sep", DIR_SEPARATOR_STRING, + NULL }; +static const char *_preCmd = "{cpp} -Wall -lang-c++ -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}"; + PORT *port; static PORT *_ports[] = @@ -294,6 +315,25 @@ _validatePorts (void) } } } + +static void +_findPort (int argc, char **argv) +{ + _validatePorts (); + + while (argc--) + { + if (!strncmp (*argv, "-m", 2)) + { + _setPort (*argv + 2); + return; + } + argv++; + } + /* Use the first in the list */ + port = _ports[0]; +} + /*-----------------------------------------------------------------*/ /* printVersionInfo - prints the version info */ /*-----------------------------------------------------------------*/ @@ -311,8 +351,9 @@ printVersionInfo () #ifdef SDCC_SUB_VERSION_STR "/" SDCC_SUB_VERSION_STR #endif -#ifdef __CYGWIN32__ - " (CYGWIN32)\n" + " (" __DATE__ ")" +#ifdef __CYGWIN__ + " (CYGWIN)\n" #else #ifdef __DJGPP__ " (DJGPP) \n" @@ -526,21 +567,6 @@ _processC1Arg (char *s) } } -static void -_addToList (const char **list, const char *str) -{ - /* This is the bad way to do things :) */ - while (*list) - list++; - *list = strdup (str); - if (!*list) - { - werror (E_OUT_OF_MEM, __FILE__, 0); - exit (1); - } - *(++list) = NULL; -} - static void _setModel (int model, const char *sz) { @@ -585,6 +611,15 @@ getIntArg(const char *szStart, char **argv, int *pi, int argc) return (int)floatFromVal(constVal(getStringArg(szStart, argv, pi, argc))); } +static void +verifyShortOption(const char *opt) +{ + if (strlen(opt) != 2) + { + werror (W_EXCESS_SHORT_OPTIONS, opt); + } +} + static bool tryHandleUnsupportedOpt(char **argv, int *pi) { @@ -644,22 +679,29 @@ tryHandleSimpleOpt(char **argv, int *pi) } for (i = 0; i < LENGTH(optionsTable); i++) - { - if (optionsTable[i].shortOpt == shortOpt || - (longOpt && optionsTable[i].longOpt && strcmp(optionsTable[i].longOpt, longOpt) == 0)) - { - // If it is a flag then we can handle it here - if (optionsTable[i].pparameter != NULL) - { - (*optionsTable[i].pparameter)++; - return 1; - } - else { - // Not a flag. Handled manually later. - return 0; - } - } - } + { + if (optionsTable[i].shortOpt == shortOpt || + (longOpt && optionsTable[i].longOpt && + strcmp(optionsTable[i].longOpt, longOpt) == 0)) + { + + // If it is a flag then we can handle it here + if (optionsTable[i].pparameter != NULL) + { + if (optionsTable[i].shortOpt == shortOpt) + { + verifyShortOption(argv[*pi]); + } + + (*optionsTable[i].pparameter)++; + return 1; + } + else { + // Not a flag. Handled manually later. + return 0; + } + } + } // Didn't find in the table return 0; } @@ -838,6 +880,7 @@ parseCmdLine (int argc, char **argv) if (strcmp (argv[i], OPTION_LESS_PEDANTIC) == 0) { + options.lessPedantic = 1; setErrorLogLevel(ERROR_LEVEL_WARNING); continue; } @@ -864,6 +907,8 @@ parseCmdLine (int argc, char **argv) switch (argv[i][1]) { case 'h': + verifyShortOption(argv[i]); + printUsage (); exit (0); break; @@ -874,6 +919,8 @@ parseCmdLine (int argc, char **argv) break; case 'c': + verifyShortOption(argv[i]); + options.cc_only = 1; break; @@ -906,6 +953,8 @@ parseCmdLine (int argc, char **argv) break; case 'v': + verifyShortOption(argv[i]); + printVersionInfo (); exit (0); break; @@ -914,12 +963,12 @@ parseCmdLine (int argc, char **argv) case 'M': { preProcOnly = 1; - _addToList (preArgv, "-M"); + addToList (preArgv, "-M"); break; } case 'C': { - _addToList (preArgv, "-C"); + addToList (preArgv, "-C"); break; } case 'd': @@ -952,7 +1001,7 @@ parseCmdLine (int argc, char **argv) sOpt = 'I'; sprintf (buffer, "-%c%s", sOpt, rest); - _addToList (preArgv, buffer); + addToList (preArgv, buffer); } break; @@ -1055,11 +1104,13 @@ linkEdit (char **envp) /* standard library path */ if (!options.nostdlib) { +/**** if (TARGET_IS_DS390) { c = "ds390"; } else +*****/ { switch (options.model) { @@ -1070,7 +1121,8 @@ linkEdit (char **envp) c = "large"; break; case MODEL_FLAT24: - c = "flat24"; + /* c = "flat24"; */ + c = "ds390"; break; default: werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); @@ -1081,7 +1133,8 @@ linkEdit (char **envp) fprintf (lnkfile, "-k %s/%s\n", SDCC_LIB_DIR /*STD_LIB_PATH */ , c); /* standard library files */ - if (strcmp (port->target, "ds390") == 0) + /* if (strcmp (port->target, "ds390") == 0) */ + if (options.model == MODEL_FLAT24) { fprintf (lnkfile, "-l %s\n", STD_DS390_LIB); } @@ -1108,7 +1161,15 @@ linkEdit (char **envp) if (options.verbose) printf ("sdcc: Calling linker...\n"); - buildCmdLine (buffer, port->linker.cmd, srcFileName, NULL, NULL, NULL); + if (port->linker.cmd) + { + buildCmdLine (buffer, port->linker.cmd, srcFileName, NULL, NULL, NULL); + } + else + { + buildCmdLine2 (buffer, port->linker.mcmd); + } + if (my_system (buffer)) { exit (1); @@ -1130,7 +1191,15 @@ linkEdit (char **envp) static void assemble (char **envp) { - buildCmdLine (buffer, port->assembler.cmd, srcFileName, NULL, NULL, asmOptions); + if (port->assembler.cmd) + { + buildCmdLine (buffer, port->assembler.cmd, srcFileName, NULL, NULL, asmOptions); + } + else + { + buildCmdLine2 (buffer, port->assembler.mcmd); + } + if (my_system (buffer)) { /* either system() or the assembler itself has reported an error @@ -1140,74 +1209,72 @@ assemble (char **envp) } } - - /*-----------------------------------------------------------------*/ /* preProcess - spawns the preprocessor with arguments */ /*-----------------------------------------------------------------*/ static int preProcess (char **envp) { - char procDef[128]; - preOutName = NULL; if (!options.c1mode) { /* if using external stack define the macro */ if (options.useXstack) - _addToList (preArgv, "-DSDCC_USE_XSTACK"); + addToList (preArgv, "-DSDCC_USE_XSTACK"); /* set the macro for stack autos */ if (options.stackAuto) - _addToList (preArgv, "-DSDCC_STACK_AUTO"); + addToList (preArgv, "-DSDCC_STACK_AUTO"); /* set the macro for stack autos */ if (options.stack10bit) - _addToList (preArgv, "-DSDCC_STACK_TENBIT"); + addToList (preArgv, "-DSDCC_STACK_TENBIT"); /* set the macro for large model */ switch (options.model) { case MODEL_LARGE: - _addToList (preArgv, "-DSDCC_MODEL_LARGE"); + addToList (preArgv, "-DSDCC_MODEL_LARGE"); break; case MODEL_SMALL: - _addToList (preArgv, "-DSDCC_MODEL_SMALL"); + addToList (preArgv, "-DSDCC_MODEL_SMALL"); break; case MODEL_COMPACT: - _addToList (preArgv, "-DSDCC_MODEL_COMPACT"); + addToList (preArgv, "-DSDCC_MODEL_COMPACT"); break; case MODEL_MEDIUM: - _addToList (preArgv, "-DSDCC_MODEL_MEDIUM"); + addToList (preArgv, "-DSDCC_MODEL_MEDIUM"); break; case MODEL_FLAT24: - _addToList (preArgv, "-DSDCC_MODEL_FLAT24"); + addToList (preArgv, "-DSDCC_MODEL_FLAT24"); break; default: werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); break; } + /* add port (processor information to processor */ + addToList (preArgv, "-DSDCC_{port}"); + addToList (preArgv, "-D__{port}"); + /* standard include path */ if (!options.nostdinc) { - _addToList (preArgv, "-I" SDCC_INCLUDE_DIR); + addToList (preArgv, "-I{includedir}"); } - /* add port (processor information to processor */ - sprintf (procDef, "-DSDCC_%s", port->target); - _addToList (preArgv, procDef); - sprintf (procDef, "-D__%s", port->target); - _addToList (preArgv, procDef); - + setMainValue ("cppextraopts", join(preArgv)); + if (!preProcOnly) preOutName = strdup (tmpnam (NULL)); + setMainValue ("cppoutfilename", preOutName); + if (options.verbose) printf ("sdcc: Calling preprocessor...\n"); - buildCmdLine (buffer, _preCmd, fullSrcFileName, - preOutName, srcFileName, preArgv); + buildCmdLine2 (buffer, _preCmd); + if (my_system (buffer)) { // @FIX: Dario Vecchio 03-05-2001 @@ -1240,22 +1307,144 @@ preProcess (char **envp) return 0; } -static void -_findPort (int argc, char **argv) +static bool +_setPaths (const char *pprefix) { - _validatePorts (); + /* Logic: + Given the prefix and how the directories were layed out at + configure time, see if the library and include directories are + where expected. If so, set. + */ + getStringDifference (buffer, PREFIX, SDCC_INCLUDE_DIR); + strcpy (scratchFileName, pprefix); + strcat (scratchFileName, buffer); + + if (pathExists (scratchFileName)) + { + setMainValue ("includedir", scratchFileName); + } + else + { + return FALSE; + } - while (argc--) + getStringDifference (buffer, PREFIX, SDCC_LIB_DIR); + strcpy (scratchFileName, pprefix); + strcat (scratchFileName, buffer); + + if (pathExists (scratchFileName)) { - if (!strncmp (*argv, "-m", 2)) - { - _setPort (*argv + 2); - return; - } - argv++; + setMainValue ("libdir", scratchFileName); } - /* Use the first in the list */ - port = _ports[0]; + else + { + return FALSE; + } + + return TRUE; +} + +static void +_discoverPaths (const char *argv0) +{ + /* Logic: + 1. Try the SDCCDIR environment variable. + 2. If (1) fails, and if the argv[0] includes a path, attempt to find the include + and library paths with respect to that. Note that under win32 + argv[0] is always the full path to the program. + 3. If (1) and (2) fail, fall back to the compile time defaults. + + Detecting assumes the same layout as when configured. If the + directories have been further moved about then discovery will + fail. + */ + + /* Some input cases: + "c:\fish\sdcc\bin\sdcc" + "../bin/sdcc" + "/home/fish/bin/sdcc" + + Note that ./sdcc is explicitly not supported as there isn't + enough information. + */ + /* bindir is handled differently to the lib and include directories. + It's rather unfortunate, but required due to the different + install and development layouts. Logic is different as well. + Sigh. + */ + if (strchr (argv0, DIR_SEPARATOR_CHAR)) + { + strcpy (scratchFileName, argv0); + *strrchr (scratchFileName, DIR_SEPARATOR_CHAR) = '\0'; + setMainValue ("bindir", scratchFileName); + ExePathList[0] = gc_strdup (scratchFileName); + } + else if (getenv (SDCCDIR_NAME) != NULL) + { + getStringDifference (buffer, PREFIX, BINDIR); + strcpy (scratchFileName, getenv (SDCCDIR_NAME)); + strcat (scratchFileName, buffer); + setMainValue ("bindir", scratchFileName); + ExePathList[0] = gc_strdup (scratchFileName); + } + else + { + setMainValue ("bindir", BINDIR); + ExePathList[0] = BINDIR; + } + + do + { + /* Case 1 */ + if (getenv (SDCCDIR_NAME) != NULL) + { + if (_setPaths (getenv (SDCCDIR_NAME))) + { + /* Successfully set. */ + break; + } + else + { + /* Include and lib wern't where expected. */ + } + } + /* Case 2 */ + if (strchr (argv0, DIR_SEPARATOR_CHAR)) + { + char *pbase = getPrefixFromBinPath (argv0); + + if (pbase == NULL) + { + /* A bad path. Skip. */ + } + else + { + if (_setPaths (pbase)) + { + /* Successfully set. */ + break; + } + else + { + /* Include and lib weren't where expected. */ + } + } + } + /* Case 3 */ + setMainValue ("includedir", SDCC_INCLUDE_DIR); + setMainValue ("libdir", SDCC_LIB_DIR); + } while (0); +} + +static void +initValues (void) +{ + populateMainValues (_baseValues); + setMainValue ("port", port->target); + setMainValue ("fullsrcfilename", fullSrcFileName); + setMainValue ("srcfilename", srcFileName); + setMainValue ("objext", port->linker.rel_ext); + setMainValue ("asmext", port->assembler.file_ext); } /* @@ -1277,6 +1466,13 @@ main (int argc, char **argv, char **envp) } _findPort (argc, argv); +#ifdef JAMIN_DS390 + if (strcmp(port->target, "mcs51") == 0) { + printf("DS390 jammed in A\n"); + _setPort ("ds390"); + ds390_jammed = 1; + } +#endif /* Initalise the port. */ if (port->init) port->init (); @@ -1284,22 +1480,15 @@ main (int argc, char **argv, char **envp) // Create a default exe search path from the path to the sdcc command - - if (strchr (argv[0], DIR_SEPARATOR_CHAR)) - { - strcpy (DefaultExePath, argv[0]); - *(strrchr (DefaultExePath, DIR_SEPARATOR_CHAR)) = 0; - ExePathList[0] = DefaultExePath; - } - - setDefaultOptions (); +#ifdef JAMIN_DS390 + if (ds390_jammed) { + options.model = MODEL_SMALL; + options.stack10bit=0; + } +#endif parseCmdLine (argc, argv); - initMem (); - - port->finaliseOptions (); - /* if no input then printUsage & exit */ if ((!options.c1mode && !srcFileName && !nrelFiles) || (options.c1mode && !srcFileName && !options.out_name)) @@ -1310,8 +1499,15 @@ main (int argc, char **argv, char **envp) if (srcFileName) { + initValues (); + _discoverPaths (argv[0]); + preProcess (envp); + initMem (); + + port->finaliseOptions (); + initSymt (); initiCode (); initCSupport (); @@ -1368,6 +1564,9 @@ main (int argc, char **argv, char **envp) free (preOutName); } // EndFix + #if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER) + rm_tmpfiles(); + #endif return 1; } @@ -1378,6 +1577,12 @@ main (int argc, char **argv, char **envp) if (cdbFile) fclose (cdbFile); + if (preOutName && !options.c1mode) + { + unlink (preOutName); + free (preOutName); + } + if (!options.cc_only && !fatalError && !noAssemble && @@ -1393,12 +1598,6 @@ main (int argc, char **argv, char **envp) if (yyin && yyin != stdin) fclose (yyin); - if (preOutName && !options.c1mode) - { - unlink (preOutName); - free (preOutName); - } - return 0; }