X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=83d4db79b205508ced2878780294407ca668215f;hb=5b419421e4a9a7ec50be2992fc640314b3520faf;hp=b7132c0c2b9b2766f6b4e71d4a5f73d8d38e7a6d;hpb=c7f4a6fa7318f4495c4c68870600eede23249868;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index b7132c0c..83d4db79 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -34,18 +34,13 @@ #include "SDCCdebug.h" #include "SDCCargs.h" -#if NATIVE_WIN32 +#ifdef _WIN32 #include -#endif - -#if !defined(__BORLANDC__) && !defined(_MSC_VER) +#else #include #include #endif -/** Name of the environment variable checked for other instalations. */ -#define SDCCDIR_NAME "SDCCDIR" - //REMOVE ME!!! extern int yyparse (); @@ -54,22 +49,24 @@ char *fullSrcFileName; /* full name for the source file; */ /* 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 */ char *moduleName; /* module name is source file without path and extension */ /* can be NULL while linking without compiling */ +/* + * in following definitions fixed length arrays are very dangerous! + * Sets should be used instead. See definition of asmOptions. + */ const char *preArgv[128]; /* pre-processor arguments */ int currRegBank = 0; -int RegBankUsed[4]={1, 0, 0, 0}; /*JCF: Reg Bank 0 used by default*/ +int RegBankUsed[4]={1, 0, 0, 0}; /*JCF: Reg Bank 0 used by default*/ struct optimize optimize; struct options options; -char *VersionString = SDCC_VERSION_STR; int preProcOnly = 0; int noAssemble = 0; +set *asmOptions = NULL; /* set of assembler options */ char *linkOptions[128]; -const char *asmOptions[128]; char *libFiles[128]; int nlibFiles = 0; char *libPaths[128]; @@ -88,10 +85,6 @@ int ds390_jammed = 0; char scratchFileName[PATH_MAX]; char buffer[PATH_MAX * 2]; -// In MSC VC6 default search path for exe's to path for this - -char DefaultExePath[128]; - #define OPTION_HELP "-help" #define LENGTH(_a) (sizeof(_a)/sizeof(*(_a))) @@ -117,7 +110,7 @@ char DefaultExePath[128]; #define OPTION_NO_LABEL_OPT "--nolabelopt" #define OPTION_NO_LOOP_INV "--noinvariant" #define OPTION_NO_LOOP_IND "--noinduction" -#define OPTION_LESS_PEDANTIC "--lesspedantic" +#define OPTION_LESS_PEDANTIC "--less-pedantic" #define OPTION_NO_GCSE "--nogcse" #define OPTION_SHORT_IS_8BITS "--short-is-8bits" #define OPTION_TINI_LIBID "--tini-libid" @@ -126,6 +119,7 @@ char DefaultExePath[128]; #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" +#define OPTION_PRINT_SEARCH_DIRS "--print-search-dirs" static const OPTION optionsTable[] = { @@ -212,6 +206,7 @@ optionsTable[] = { { 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"}, + { 0, OPTION_PRINT_SEARCH_DIRS, &options.printSearchDirs, "display the directories in the compiler's search path"}, /* End of options */ { 0, NULL } }; @@ -242,14 +237,14 @@ unsupportedOptTable[] = { /** List of all default constant macros. */ static const char *_baseValues[] = { - "cpp", "{bindir}{sep}sdcpp", + "cpp", "sdcpp", "cppextraopts", "", /* Path seperator character */ "sep", DIR_SEPARATOR_STRING, NULL }; -static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}"; +static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 -DSDCC=1 {cppextraopts} \"{fullsrcfilename}\" \"{cppoutfilename}\""; PORT *port; @@ -279,6 +274,9 @@ static PORT *_ports[] = #if !OPT_DISABLE_XA51 &xa51_port, #endif +#if !OPT_DISABLE_DS400 + &ds400_port, +#endif }; #define NUM_PORTS (sizeof(_ports)/sizeof(_ports[0])) @@ -383,7 +381,7 @@ printVersionInfo () for (i = 0; i < NUM_PORTS; i++) fprintf (stderr, "%s%s", i == 0 ? "" : "/", _ports[i]->target); - fprintf (stderr, " %s" + fprintf (stderr, " " SDCC_VERSION_STR #ifdef SDCC_SUB_VERSION_STR "/" SDCC_SUB_VERSION_STR #endif @@ -391,18 +389,16 @@ printVersionInfo () #ifdef __CYGWIN__ " (CYGWIN)\n" #elif defined __MINGW32__ - " (MINGW32) \n" + " (MINGW32)\n" #elif defined __DJGPP__ - " (DJGPP) \n" + " (DJGPP)\n" #elif defined(_MSC_VER) - " (MSVC) \n" + " (MSVC)\n" #elif defined(__BORLANDC__) - " (BORLANDC) \n" + " (BORLANDC)\n" #else " (UNIX) \n" #endif - - ,VersionString ); } @@ -475,6 +471,26 @@ parseWithComma (char **dest, char *src) } } +/*-----------------------------------------------------------------*/ +/* setParseWithComma - separates string with comma to a set */ +/*-----------------------------------------------------------------*/ +void +setParseWithComma (set **dest, char *src) +{ + char *p; + + /* skip the initial white spaces */ + while (isspace (*src)) + src++; + + if ((p = strtok(src, ",")) != NULL) { + do + { + addSet(dest, p); + } while ((p = strtok(NULL, ",")) != NULL); + } +} + /*-----------------------------------------------------------------*/ /* setDefaultOptions - sets the default options */ /*-----------------------------------------------------------------*/ @@ -484,9 +500,7 @@ setDefaultOptions () int i; for (i = 0; i < 128; i++) - preArgv[i] = asmOptions[i] = - linkOptions[i] = relFiles[i] = libFiles[i] = - libPaths[i] = NULL; + preArgv[i] = linkOptions[i] = relFiles[i] = libFiles[i] = libPaths[i] = NULL; /* first the options part */ options.stack_loc = 0; /* stack pointer initialised to 0 */ @@ -632,20 +646,20 @@ _setModel (int model, const char *sz) static char * getStringArg(const char *szStart, char **argv, int *pi, int argc) { - if (argv[*pi][strlen(szStart)]) + if (argv[*pi][strlen(szStart)]) { return &argv[*pi][strlen(szStart)]; } - else + else { ++(*pi); - if (*pi >= argc) + if (*pi >= argc) { werror (E_ARGUMENT_MISSING, szStart); /* Die here rather than checking for errors later. */ exit(-1); } - else + else { return argv[*pi]; } @@ -653,7 +667,7 @@ getStringArg(const char *szStart, char **argv, int *pi, int argc) } /** Gets the integer argument to this option using the same rules as - getStringArg. + getStringArg. */ static int getIntArg(const char *szStart, char **argv, int *pi, int argc) @@ -1050,7 +1064,6 @@ parseCmdLine (int argc, char **argv) else { fullDstFileName = Safe_strdup (buffer); - fullDstFileNameLen = strlen(fullDstFileName) + 1; /* get rid of the "."-extension */ @@ -1088,7 +1101,7 @@ parseCmdLine (int argc, char **argv) /* assembler options */ else if (argv[i][2] == 'a') { - parseWithComma ((char **) asmOptions, getStringArg("-Wa", argv, &i, argc)); + setParseWithComma (&asmOptions, getStringArg("-Wa", argv, &i, argc)); } else { @@ -1145,7 +1158,8 @@ parseCmdLine (int argc, char **argv) if (sOpt == 'Y') sOpt = 'I'; - SNPRINTF (buffer, sizeof(buffer), "-%c%s", sOpt, rest); + SNPRINTF (buffer, sizeof(buffer), + ((sOpt == 'I') ? "-%c\"%s\"": "-%c%s"), sOpt, rest); addToList (preArgv, buffer); } break; @@ -1248,7 +1262,7 @@ parseCmdLine (int argc, char **argv) /* if debug option is set then open the cdbFile */ if (options.debug && fullSrcFileName) { - SNPRINTF (scratchFileName, sizeof(scratchFileName), + SNPRINTF (scratchFileName, sizeof(scratchFileName), "%s.adb", dstFileName); //JCF: Nov 30, 2002 if(debugFile->openFile(scratchFileName)) debugFile->writeModule(moduleName); @@ -1269,7 +1283,7 @@ linkEdit (char **envp) int i, system_ret; /* first we need to create the .lnk file */ - SNPRINTF (scratchFileName, sizeof(scratchFileName), + SNPRINTF (scratchFileName, sizeof(scratchFileName), "%s.lnk", dstFileName); if (!(lnkfile = fopen (scratchFileName, "w"))) { @@ -1346,7 +1360,21 @@ linkEdit (char **envp) break; case MODEL_FLAT24: /* c = "flat24"; */ - c = "ds390"; + if (TARGET_IS_DS390) + { + c = "ds390"; + } + else if (TARGET_IS_DS400) + { + c = "ds400"; + } + else + { + fprintf(stderr, + "Add support for your FLAT24 target in %s @ line %d\n", + __FILE__, __LINE__); + exit(-1); + } break; case MODEL_PAGE0: c = "xa51"; @@ -1362,7 +1390,21 @@ linkEdit (char **envp) #if !OPT_DISABLE_DS390 if (options.model == MODEL_FLAT24) { - fprintf (lnkfile, "-l %s\n", STD_DS390_LIB); + if (TARGET_IS_DS390) + { + fprintf (lnkfile, "-l %s\n", STD_DS390_LIB); + } + else if (TARGET_IS_DS400) + { + fprintf (lnkfile, "-l %s\n", STD_DS400_LIB); + } + else + { + fprintf(stderr, + "Add support for your FLAT24 target in %s @ line %d\n", + __FILE__, __LINE__); + exit(-1); + } } #endif @@ -1448,43 +1490,36 @@ linkEdit (char **envp) else { strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName)); - /* strip "rel" extension */ + /* strip ".rel" extension */ p = strrchr (scratchFileName, '.'); if (p) { - p++; - *p = 0; + *p = 0; } - } strncatz (scratchFileName, - options.out_fmt ? "S19" : "ihx", + options.out_fmt ? ".S19" : ".ihx", sizeof(scratchFileName)); rename (scratchFileName, fullDstFileName); - q = strrchr (fullDstFileName, '.'); - if (q) - { - /* point after the '.' of the extension */ - q++; - } - else + strncpyz (buffer, fullDstFileName, sizeof(buffer)); + q = strrchr (buffer, '.'); + if (!q) { /* no extension: append new extensions */ - /* Don't we want to append a period here ? */ - q = strlen (fullDstFileName) + fullDstFileName; + q = strlen (buffer) + buffer; } - - *p = 0; - strncatz (scratchFileName, "map", sizeof(scratchFileName)); + + *p = 0; + strncatz (scratchFileName, ".map", sizeof(scratchFileName)); *q = 0; - strncatz(fullDstFileName, "map", fullDstFileNameLen); - rename (scratchFileName, fullDstFileName); - *p = 0; - strncatz (scratchFileName, "mem", sizeof(scratchFileName)); + strncatz(buffer, ".map", sizeof(buffer)); + rename (scratchFileName, buffer); + *p = 0; + strncatz (scratchFileName, ".mem", sizeof(scratchFileName)); *q = 0; - strncatz(fullDstFileName, "mem", fullDstFileNameLen); - rename (scratchFileName, fullDstFileName); + strncatz(buffer, ".mem", sizeof(buffer)); + rename (scratchFileName, buffer); } if (system_ret) { @@ -1598,7 +1633,7 @@ preProcess (char **envp) /* standard include path */ if (!options.nostdinc) { - addToList (preArgv, "-I{includedir}"); + addToList (preArgv, "-I\"{includedir}\""); } setMainValue ("cppextraopts", join(preArgv)); @@ -1610,8 +1645,8 @@ preProcess (char **envp) } else { - /* Have to set cppoutfilename to something, even if piping */ - setMainValue ("cppoutfilename", ""); + /* Piping: set cppoutfilename to NULL, to avoid empty quotes */ + setMainValue ("cppoutfilename", NULL); } if (options.verbose) @@ -1638,133 +1673,138 @@ preProcess (char **envp) return 0; } -static bool -_setPaths (const char *pprefix) +/* Set bin paths */ +static void +setBinPaths(const char *argv0) { - /* 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); - strncpyz (scratchFileName, pprefix, sizeof(scratchFileName)); - strncatz (scratchFileName, buffer, sizeof(scratchFileName)); - - if (pathExists (scratchFileName)) - { - setMainValue ("includedir", scratchFileName); - } - else - { - return FALSE; - } + char *p; + char buf[PATH_MAX]; + + /* + * Search logic: + * + * 1. - $SDCCDIR/PREFIX2BIN_DIR + * 2. - path(argv[0]) + * 3. - $PATH + */ - getPathDifference (buffer, PREFIX, SDCC_LIB_DIR); - strncpyz (scratchFileName, pprefix, sizeof(scratchFileName)); - strncatz (scratchFileName, buffer, sizeof(scratchFileName)); + /* do it in reverse mode, so that addSetHead() can be used + instead of slower addSet() */ - if (pathExists (scratchFileName)) - { - setMainValue ("libdir", scratchFileName); - } - else - { - return FALSE; + if ((p = getBinPath(argv0)) != NULL) + addSetHead(&binPathSet, Safe_strdup(p)); + + if ((p = getenv(SDCC_DIR_NAME)) != NULL) { + SNPRINTF(buf, sizeof buf, "%s" PREFIX2BIN_DIR, p); + addSetHead(&binPathSet, Safe_strdup(buf)); + } + + if (options.printSearchDirs) { + printf("programs: "); + if (NULL != (p = (char *)setFirstItem(binPathSet))) { + printf("%s", p); + while (NULL != (p = (char *)setNextItem(binPathSet))) + printf(":%s", p); } + putchar('\n'); + } +} + +/* Set system include path */ +static void +setIncludePath(const char *datadir) +{ + char *p; + char buf[PATH_MAX]; + + /* + * Search logic: + * + * 1. - $SDCC_INCLUDE + * 2. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX + * 3. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX + * 4. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix) + */ + + if ((p = getenv(SDCC_INCLUDE_NAME)) == NULL) { + SNPRINTF(buf, sizeof buf, "%s" INCLUDE_DIR_SUFFIX, datadir); + p = buf; + } + + if (options.printSearchDirs) + printf("includedir: %s\n", p); - return TRUE; + setMainValue ("includedir", p); } +/* Set system lib path */ static void -_discoverPaths (const char *argv0) +setLibPath(const char *datadir) { - /* 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. + char *p; + char buf[PATH_MAX]; + + /* + * Search logic: + * + * 1. - $SDCC_LIB + * 2. - $SDCC_HOME/PREFIX2DATA_DIR/LIB_DIR_SUFFIX/ + * 3. - path(argv[0])/BIN2DATA_DIR/LIB_DIR_SUFFIX/ + * 4. - DATADIR/LIB_DIR_SUFFIX/ (only on *nix) */ - if (strchr (argv0, DIR_SEPARATOR_CHAR)) - { - strncpyz (scratchFileName, argv0, sizeof(scratchFileName)); - *strrchr (scratchFileName, DIR_SEPARATOR_CHAR) = '\0'; - setMainValue ("bindir", scratchFileName); - ExePathList[0] = Safe_strdup (scratchFileName); - } - else if (getenv (SDCCDIR_NAME) != NULL) - { - getPathDifference (buffer, PREFIX, BINDIR); - strncpyz (scratchFileName, getenv (SDCCDIR_NAME), sizeof(scratchFileName)); - strncatz (scratchFileName, buffer, sizeof(scratchFileName)); - 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 ((p = getenv(SDCC_LIB_NAME)) == NULL) { + SNPRINTF(buf, sizeof buf, "%s" LIB_DIR_SUFFIX, datadir); + p = buf; + } - 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); + if (options.printSearchDirs) + printf("libdir: %s\n", p); + + setMainValue ("libdir", p); +} + +/* Set data path */ +static void +setDataPaths(const char *argv0) +{ + char *p; + char buf[PATH_MAX]; + + /* + * Search logic: + * + * 1. - $SDCC_HOME/PREFIX2DATA_DIR + * 2. - path(argv[0])/BIN2DATA_DIR + * 3. - DATADIR (only on *nix) + */ + + if ((p = getenv(SDCC_DIR_NAME)) != NULL) { + SNPRINTF(buf, sizeof buf, "%s" PREFIX2DATA_DIR, p); + p = buf; + } + else if ((p = getBinPath(argv0)) != NULL) { + SNPRINTF(buf, sizeof buf, "%s" BIN2DATA_DIR, p); + p = buf; + } +#ifdef _WIN32 + else { + /* this should never happen... */ + wassertl(0, "Can't get binary path"); + p = "."; + } +#else + if (!pathExists(p)) + p = DATADIR; /* last resort */ +#endif + + if (options.printSearchDirs) + printf("datadir: %s\n", p); + + setIncludePath(p); + setLibPath(p); + + setMainValue ("datadir", p); } static void @@ -1879,9 +1919,6 @@ main (int argc, char **argv, char **envp) if (port->init) port->init (); - // Create a default exe search path from the path to the sdcc command - - setDefaultOptions (); #ifdef JAMIN_DS390 if (ds390_jammed) { @@ -1891,15 +1928,17 @@ main (int argc, char **argv, char **envp) #endif parseCmdLine (argc, argv); + initValues (); + setBinPaths(argv[0]); + setDataPaths(argv[0]); + /* if no input then printUsage & exit */ - if (!options.c1mode && !fullSrcFileName && !nrelFiles) - { - printUsage (); - exit (0); - } + if (!options.c1mode && !fullSrcFileName && !nrelFiles) { + if (!options.printSearchDirs) + printUsage(); - initValues (); - _discoverPaths (argv[0]); + exit(0); + } /* initMem() is expensive, but initMem() must called before port->finaliseOptions ().