X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=705e408f2a8a711981d76f5899485a408311e226;hb=a33fd8046d6eb986d762dfecbd5f82c566cdac30;hp=6f7f2edc6797fb33f5eb1565865f70d241332e15;hpb=13f2f0bb5a09a9bb7611c2dc559653349c2bd986;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 6f7f2edc..705e408f 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 scratchFileName[PATH_MAX]; +char buffer[PATH_MAX]; // In MSC VC6 default search path for exe's to path for this @@ -157,6 +171,7 @@ optionsTable[] = { { 0, "--dumpliverange", &options.dump_range, NULL }, { 0, "--dumpregpack", &options.dump_pack, NULL }, { 0, "--dumpregassign", &options.dump_rassgn, NULL }, + { 0, "--dumptree", &options.dump_tree, NULL }, { 0, OPTION_DUMP_ALL, NULL, "Dump the internal structure at all stages" }, { 0, OPTION_XRAM_LOC, NULL, " External Ram start location" }, { 0, OPTION_IRAM_SIZE, NULL, " Internal Ram size" }, @@ -189,7 +204,8 @@ optionsTable[] = { { 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, "--profile", &options.profile, "On supported ports, generate extra profiling information" } + { 0, "--profile", &options.profile, "On supported ports, generate extra profiling information" }, + { 0, "--fommit-frame-pointer", &options.ommitFramePtr, "Leave out the frame pointer." } }; /** Table of all unsupported options and help text to display when one @@ -219,12 +235,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[] = @@ -295,6 +317,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 */ /*-----------------------------------------------------------------*/ @@ -312,6 +353,7 @@ printVersionInfo () #ifdef SDCC_SUB_VERSION_STR "/" SDCC_SUB_VERSION_STR #endif + " (" __DATE__ ")" #ifdef __CYGWIN__ " (CYGWIN)\n" #else @@ -462,14 +504,14 @@ processFile (char *s) { werror (E_FILE_OPEN_ERR, s); exit (1); - } + } /* copy the file name into the buffer */ strcpy (buffer, s); /* get rid of the "." */ strtok (buffer, "."); - srcFileName = Safe_calloc (1, strlen (buffer) + 1); + srcFileName = Safe_alloc ( strlen (buffer) + 1); strcpy (srcFileName, buffer); /* get rid of any path information @@ -482,7 +524,7 @@ processFile (char *s) *(fext - 1) != '/' && *(fext - 1) != ':') fext--; - moduleName = Safe_calloc (1, strlen (fext) + 1); + moduleName = Safe_alloc ( strlen (fext) + 1); strcpy (moduleName, fext); return; @@ -519,7 +561,7 @@ _processC1Arg (char *s) werror (W_TOO_MANY_SRC, s); return; } - options.out_name = strdup (s); + options.out_name = Safe_strdup (s); } else { @@ -527,21 +569,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) { @@ -855,6 +882,7 @@ parseCmdLine (int argc, char **argv) if (strcmp (argv[i], OPTION_LESS_PEDANTIC) == 0) { + options.lessPedantic = 1; setErrorLogLevel(ERROR_LEVEL_WARNING); continue; } @@ -937,12 +965,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': @@ -975,7 +1003,7 @@ parseCmdLine (int argc, char **argv) sOpt = 'I'; sprintf (buffer, "-%c%s", sOpt, rest); - _addToList (preArgv, buffer); + addToList (preArgv, buffer); } break; @@ -1047,10 +1075,10 @@ linkEdit (char **envp) fprintf (lnkfile, "-z\n"); #define WRITE_SEG_LOC(N, L) \ - segName = strdup(N); \ + segName = Safe_strdup(N); \ c = strtok(segName, " \t"); \ fprintf (lnkfile,"-b %s = 0x%04x\n", c, L); \ - if (segName) { free(segName); } + if (segName) { Safe_free(segName); } /* code segment start */ WRITE_SEG_LOC (CODE_NAME, options.code_loc); @@ -1104,7 +1132,7 @@ linkEdit (char **envp) break; } } - fprintf (lnkfile, "-k %s/%s\n", SDCC_LIB_DIR /*STD_LIB_PATH */ , c); + mfprintf (lnkfile, getRuntimeVariables(), "-k {libdir}{sep}%s\n", c); /* standard library files */ /* if (strcmp (port->target, "ds390") == 0) */ @@ -1135,7 +1163,17 @@ linkEdit (char **envp) if (options.verbose) printf ("sdcc: Calling linker...\n"); - buildCmdLine (buffer, port->linker.cmd, srcFileName, NULL, NULL, NULL); + if (port->linker.cmd) + { + char buffer2[PATH_MAX]; + buildCmdLine (buffer2, port->linker.cmd, srcFileName, NULL, NULL, NULL); + buildCmdLine2 (buffer, buffer2); + } + else + { + buildCmdLine2 (buffer, port->linker.mcmd); + } + if (my_system (buffer)) { exit (1); @@ -1144,7 +1182,7 @@ linkEdit (char **envp) if (strcmp (srcFileName, "temp") == 0) { /* rename "temp.cdb" to "firstRelFile.cdb" */ - char *f = strtok (strdup (relFiles[0]), "."); + char *f = strtok (Safe_strdup (relFiles[0]), "."); f = strcat (f, ".cdb"); rename ("temp.cdb", f); srcFileName = NULL; @@ -1157,7 +1195,17 @@ 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, + options.debug ? port->assembler.debug_opts : port->assembler.plain_opts, + asmOptions); + } + else + { + buildCmdLine2 (buffer, port->assembler.mcmd); + } + if (my_system (buffer)) { /* either system() or the assembler itself has reported an error @@ -1167,81 +1215,84 @@ 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 no overlay */ + if (options.noOverlay) + addToList (preArgv, "-DSDCC_NOOVERLAY"); /* 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)); + preOutName = Safe_strdup (tempfilename ()); + /* Have to set cppoutfilename to something, even if just pre-processing. */ + setMainValue ("cppoutfilename", preOutName ? 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 if (preOutName) { unlink (preOutName); - free (preOutName); + Safe_free (preOutName); } // EndFix exit (1); @@ -1267,22 +1318,145 @@ 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. + */ + getPathDifference (buffer, PREFIX, SDCC_INCLUDE_DIR); + strcpy (scratchFileName, pprefix); + strcat (scratchFileName, buffer); + + if (pathExists (scratchFileName)) + { + setMainValue ("includedir", scratchFileName); + } + else + { + return FALSE; + } - while (argc--) + getPathDifference (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] = Safe_strdup (scratchFileName); + } + else if (getenv (SDCCDIR_NAME) != NULL) + { + getPathDifference (buffer, PREFIX, BINDIR); + strcpy (scratchFileName, getenv (SDCCDIR_NAME)); + strcat (scratchFileName, buffer); + setMainValue ("bindir", scratchFileName); + ExePathList[0] = Safe_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 weren'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 ("objext", port->linker.rel_ext); + setMainValue ("asmext", port->assembler.file_ext); + + setMainValue ("fullsrcfilename", fullSrcFileName ? fullSrcFileName : "fullsrcfilename"); + setMainValue ("srcfilename", srcFileName ? srcFileName : "srcfilename"); } /* @@ -1304,6 +1478,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 (); @@ -1311,23 +1492,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); - if (getenv("SDCPP")) - { - _preCmd[0] = getenv("SDCPP"); - } - /* if no input then printUsage & exit */ if ((!options.c1mode && !srcFileName && !nrelFiles) || (options.c1mode && !srcFileName && !options.out_name)) @@ -1336,6 +1509,9 @@ main (int argc, char **argv, char **envp) exit (0); } + initValues (); + _discoverPaths (argv[0]); + if (srcFileName) { preProcess (envp); @@ -1377,7 +1553,7 @@ main (int argc, char **argv, char **envp) if (yyin && yyin != stdin) fclose (yyin); unlink (preOutName); - free (preOutName); + Safe_free (preOutName); } // EndFix return 1; @@ -1397,7 +1573,7 @@ main (int argc, char **argv, char **envp) if (yyin && yyin != stdin) fclose (yyin); unlink (preOutName); - free (preOutName); + Safe_free (preOutName); } // EndFix #if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER) @@ -1416,7 +1592,7 @@ main (int argc, char **argv, char **envp) if (preOutName && !options.c1mode) { unlink (preOutName); - free (preOutName); + Safe_free (preOutName); } if (!options.cc_only &&