X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FSDCCmain.c;h=83d4db79b205508ced2878780294407ca668215f;hb=5b419421e4a9a7ec50be2992fc640314b3520faf;hp=e5403843153088bdec7396cb3d79b0b67b5f2d77;hpb=70ffafeadc0f26768faf24887b32d0dd5c827737;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index e5403843..83d4db79 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" @@ -30,46 +31,48 @@ #include "MySystem.h" #include "SDCCmacro.h" #include "SDCCutil.h" +#include "SDCCdebug.h" +#include "SDCCargs.h" -#if NATIVE_WIN32 +#ifdef _WIN32 #include #else -#include "spawn.h" -#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 (); FILE *srcFile; /* source file */ -FILE *cdbFile = NULL; /* debugger information output file */ -char *fullSrcFileName; /* full name for the source file */ -char *srcFileName; /* source file name with the .c stripped */ -char *moduleName; /* module name is srcFilename stripped of any path */ +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 */ +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*/ struct optimize optimize; struct options options; -char *VersionString = SDCC_VERSION_STR /*"Version 2.1.8a" */ ; 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]; int nlibPaths = 0; char *relFiles[128]; 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. */ @@ -80,11 +83,7 @@ int ds390_jammed = 0; // Globally accessible scratch buffer for file names. char scratchFileName[PATH_MAX]; -char buffer[PATH_MAX]; - -// In MSC VC6 default search path for exe's to path for this - -char DefaultExePath[128]; +char buffer[PATH_MAX * 2]; #define OPTION_HELP "-help" @@ -108,35 +107,24 @@ 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" +#define OPTION_LESS_PEDANTIC "--less-pedantic" #define OPTION_NO_GCSE "--nogcse" #define OPTION_SHORT_IS_8BITS "--short-is-8bits" - -/** Table of all options supported by all ports. - This table provides: - * A reference for all options. - * An easy way to maintain help for the options. - * Automatic support for setting flags on simple options. -*/ -typedef struct { - /** The short option character e.g. 'h' for -h. 0 for none. */ - char shortOpt; - /** Long option e.g. "--help". Includes the -- prefix. NULL for - none. */ - const char *longOpt; - /** Pointer to an int that will be incremented every time the - option is encountered. May be NULL. - */ - int *pparameter; - /** Help text to go with this option. May be NULL. */ - const char *help; -} OPTION; - -static const OPTION +#define OPTION_TINI_LIBID "--tini-libid" +#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" +#define OPTION_PRINT_SEARCH_DIRS "--print-search-dirs" + +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" }, { 'd', NULL, NULL, NULL }, { 'D', NULL, NULL, "Define macro as in -Dmacro" }, { 'I', NULL, NULL, "Add to the include (*.h) path, as in -Ipath" }, @@ -144,7 +132,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" }, @@ -157,13 +145,14 @@ optionsTable[] = { { 0, OPTION_STACK_8BIT, NULL, "use the 8bit stack for the ds390 (not supported yet)" }, { 0, "--stack-10bit", &options.stack10bit, "use the 10bit stack for ds390 (default)" }, { 0, "--xstack", &options.useXstack, "Use external stack" }, - { 0, "--generic", &options.genericPtr, "All unqualified ptrs converted to '_generic'" }, { 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" }, { 0, "--noloopreverse", &optimize.noLoopReverse, "Disable the loop reverse optimisation" }, { 'c', "--compile-only", &options.cc_only, "Compile and assemble, but do not link" }, + { 'o', NULL, NULL, "Place the output into the given path resp. file" }, { 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 }, @@ -174,9 +163,11 @@ optionsTable[] = { { 0, "--dumptree", &options.dump_tree, "dump front-end AST before generating iCode" }, { 0, OPTION_DUMP_ALL, NULL, "Dump the internal structure at all stages" }, { 0, OPTION_XRAM_LOC, NULL, " External Ram start location" }, + { 0, OPTION_XRAM_SIZE, NULL, " External Ram size" }, { 0, OPTION_IRAM_SIZE, NULL, " Internal Ram size" }, { 0, OPTION_XSTACK_LOC, NULL, " External Ram start location" }, { 0, OPTION_CODE_LOC, NULL, " Code Segment Location" }, + { 0, OPTION_CODE_SIZE, NULL, " Code Segment size" }, { 0, OPTION_STACK_LOC, NULL, " Stack pointer initial value" }, { 0, OPTION_DATA_LOC, NULL, " Direct data start location" }, { 0, OPTION_IDATA_LOC, NULL, NULL }, @@ -189,14 +180,14 @@ optionsTable[] = { { 0, "--cyclomatic", &options.cyclomatic, NULL }, { 0, "--nooverlay", &options.noOverlay, NULL }, { 0, "--main-return", &options.mainreturn, "Issue a return after main()" }, + { 0, "--xram-movc", &options.xram_movc, "Use movc instead of movx to read xram (xdata)" }, { 0, "--no-peep", &options.nopeep, "Disable the peephole assembly file optimisation" }, { 0, "--no-reg-params", &options.noRegParams, "On some ports, disable passing some parameters in registers" }, { 0, "--peep-asm", &options.asmpeep, NULL }, { 0, "--debug", &options.debug, "Enable debugging symbol output" }, { 'v', OPTION_VERSION, NULL, "Display sdcc's version" }, - { 0, "--stack-after-data", &options.stackOnData, "initialize the stackpointer with the last byte use in DSEG" }, { '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" }, @@ -208,7 +199,16 @@ optionsTable[] = { { 0, "--fommit-frame-pointer", &options.ommitFramePtr, "Leave out the frame pointer." }, { 0, "--all-callee-saves", &options.all_callee_saves, "callee will always save registers used" }, { 0, "--use-accelerator", &options.useAccelerator,"generate code for DS390 Arithmetic Accelerator"}, - { 0, "--stack-probe", &options.stack_probe,"insert call to function __stack_probe at each function prologue"} + { 0, "--stack-probe", &options.stack_probe,"insert call to function __stack_probe at each function prologue"}, + { 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, &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 } }; /** Table of all unsupported options and help text to display when one @@ -226,12 +226,8 @@ typedef struct { static const UNSUPPORTEDOPT unsupportedOptTable[] = { - { 'a', NULL, "use --stack-auto instead." }, - { 'g', NULL, "use --generic instead" }, { 'X', NULL, "use --xstack-loc instead" }, { 'x', NULL, "use --xstack instead" }, - { 'p', NULL, "use --stack-loc instead" }, - { 'P', NULL, "use --stack-loc instead" }, { 'i', NULL, "use --idata-loc instead" }, { 'r', NULL, "use --xdata-loc instead" }, { 's', NULL, "use --code-loc instead" }, @@ -241,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} -Wall -lang-c++ -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}"; +static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 -DSDCC=1 {cppextraopts} \"{fullsrcfilename}\" \"{cppoutfilename}\""; PORT *port; @@ -272,23 +268,22 @@ static PORT *_ports[] = #if !OPT_DISABLE_PIC &pic_port, #endif -#if !OPT_DISABLE_I186 - &i186_port, -#endif -#if !OPT_DISABLE_TLCS900H - &tlcs900h_port, -#endif #if !OPT_DISABLE_TININative &tininative_port, #endif +#if !OPT_DISABLE_XA51 + &xa51_port, +#endif +#if !OPT_DISABLE_DS400 + &ds400_port, +#endif }; #define NUM_PORTS (sizeof(_ports)/sizeof(_ports[0])) -/** - remove me - TSD a hack to force sdcc to generate gpasm format .asm files. - */ +#if !OPT_DISABLE_PIC extern void picglue (); +#endif /** Sets the port to the one given by the command line option. @param The name minus the option (eg 'mcs51') @@ -311,6 +306,15 @@ _setPort (const char *name) exit (1); } +/* Override the default processor with the one specified + * on the command line */ +static void +_setProcessor (char *_processor) +{ + port->processor = _processor; + fprintf(stderr,"Processor: %s\n",_processor); +} + static void _validatePorts (void) { @@ -319,11 +323,16 @@ _validatePorts (void) { if (_ports[i]->magic != PORT_MAGIC) { + /* Uncomment this line to debug which port is causing the problem + * (the target name is close to the beginning of the port struct + * and probably can be accessed just fine). */ + fprintf(stderr,"%s :",_ports[i]->target); wassertl (0, "Port definition structure is incomplete"); } } } +/* search through the command line options for the port */ static void _findPort (int argc, char **argv) { @@ -342,6 +351,23 @@ _findPort (int argc, char **argv) port = _ports[0]; } +/* search through the command line options for the processor */ +static void +_findProcessor (int argc, char **argv) +{ + while (argc--) + { + if (!strncmp (*argv, "-p", 2)) + { + _setProcessor (*argv + 2); + return; + } + argv++; + } + + /* no error if processor was not specified. */ +} + /*-----------------------------------------------------------------*/ /* printVersionInfo - prints the version info */ /*-----------------------------------------------------------------*/ @@ -355,29 +381,42 @@ 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 " (" __DATE__ ")" #ifdef __CYGWIN__ " (CYGWIN)\n" -#else -#ifdef __DJGPP__ - " (DJGPP) \n" -#else -#if defined(_MSC_VER) - " (WIN32) \n" +#elif defined __MINGW32__ + " (MINGW32)\n" +#elif defined __DJGPP__ + " (DJGPP)\n" +#elif defined(_MSC_VER) + " (MSVC)\n" +#elif defined(__BORLANDC__) + " (BORLANDC)\n" #else " (UNIX) \n" #endif -#endif -#endif - - ,VersionString ); } +static void +printOptions(const OPTION *optionsTable) +{ + int i; + for (i = 0; optionsTable[i].shortOpt != 0 || optionsTable[i].longOpt != NULL; i++) + { + fprintf(stdout, " %c%c %-20s %s\n", + optionsTable[i].shortOpt !=0 ? '-' : ' ', + optionsTable[i].shortOpt !=0 ? optionsTable[i].shortOpt : ' ', + optionsTable[i].longOpt != NULL ? optionsTable[i].longOpt : "", + optionsTable[i].help != NULL ? optionsTable[i].help : "" + ); + } +} + /*-----------------------------------------------------------------*/ /* printUsage - prints command line syntax */ /*-----------------------------------------------------------------*/ @@ -390,15 +429,18 @@ printUsage () "Usage : sdcc [options] filename\n" "Options :-\n" ); - - for (i = 0; i < LENGTH(optionsTable); i++) { - fprintf(stdout, " %c%c %-20s %s\n", - optionsTable[i].shortOpt !=0 ? '-' : ' ', - optionsTable[i].shortOpt !=0 ? optionsTable[i].shortOpt : ' ', - optionsTable[i].longOpt != NULL ? optionsTable[i].longOpt : "", - optionsTable[i].help != NULL ? optionsTable[i].help : "" - ); - } + + printOptions(optionsTable); + + for (i = 0; i < NUM_PORTS; i++) + { + if (_ports[i]->poptions != NULL) + { + fprintf (stdout, "\nSpecial options for the %s port:\n", _ports[i]->target); + printOptions (_ports[i]->poptions); + } + } + exit (0); } @@ -429,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 */ /*-----------------------------------------------------------------*/ @@ -438,18 +500,15 @@ 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 */ options.xstack_loc = 0; /* xternal stack starts at 0 */ options.code_loc = 0; /* code starts at 0 */ - options.data_loc = 0x0030; /* data starts at 0x0030 */ + options.data_loc = 0; /* JCF: By default let the linker locate data */ options.xdata_loc = 0; options.idata_loc = 0x80; - options.genericPtr = 1; /* default on */ options.nopeep = 0; options.model = port->general.default_model; options.nostdlib = 0; @@ -495,44 +554,59 @@ 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 */ - if (srcFileName) + if (fullSrcFileName) { werror (W_TOO_MANY_SRC, s); return; } /* the only source file */ - if (!(srcFile = fopen ((fullSrcFileName = s), "r"))) + fullSrcFileName = s; + if (!(srcFile = fopen (fullSrcFileName, "r"))) { werror (E_FILE_OPEN_ERR, s); exit (1); } /* copy the file name into the buffer */ - strcpy (buffer, s); + strncpyz (buffer, s, sizeof(buffer)); - /* get rid of the "." */ - strtok (buffer, "."); - srcFileName = Safe_alloc ( strlen (buffer) + 1); - strcpy (srcFileName, buffer); + /* get rid of the "."-extension */ + + /* is there a dot at all? */ + if (strrchr (buffer, '.') && + /* is the dot in the filename, not in the path? */ + (strrchr (buffer, DIR_SEPARATOR_CHAR) < strrchr (buffer, '.'))) + { + *strrchr (buffer, '.') = '\0'; + } /* get rid of any path information - for the module name; do this by going - backwards till we get to either '/' or '\' or ':' - or start of buffer */ + for the module name; */ fext = buffer + strlen (buffer); +#if NATIVE_WIN32 + /* do this by going backwards till we + get '\' or ':' or start of buffer */ while (fext != buffer && - *(fext - 1) != '\\' && - *(fext - 1) != '/' && + *(fext - 1) != DIR_SEPARATOR_CHAR && *(fext - 1) != ':') + { fext--; - moduleName = Safe_alloc ( strlen (fext) + 1); - strcpy (moduleName, fext); - + } +#else + /* do this by going backwards till we + get '/' or start of buffer */ + while (fext != buffer && + *(fext - 1) != DIR_SEPARATOR_CHAR) + { + fext--; + } +#endif + moduleName = Safe_strdup ( fext ); return; } @@ -557,24 +631,6 @@ processFile (char *s) } -static void -_processC1Arg (char *s) -{ - if (srcFileName) - { - if (options.out_name) - { - werror (W_TOO_MANY_SRC, s); - return; - } - options.out_name = Safe_strdup (s); - } - else - { - processFile (s); - } -} - static void _setModel (int model, const char *sz) { @@ -590,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]; } @@ -611,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) @@ -652,7 +708,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; } @@ -667,6 +726,38 @@ tryHandleUnsupportedOpt(char **argv, int *pi) } } +static bool +scanOptionsTable(const OPTION *optionsTable, char shortOpt, const char *longOpt, char **argv, int *pi) +{ + int i; + for (i = 0; optionsTable[i].shortOpt != 0 || optionsTable[i].longOpt != NULL; 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) + { + 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; +} + static bool tryHandleSimpleOpt(char **argv, int *pi) { @@ -674,7 +765,6 @@ tryHandleSimpleOpt(char **argv, int *pi) { const char *longOpt = ""; char shortOpt = -1; - int i; if (argv[*pi][1] == '-') { @@ -686,32 +776,19 @@ tryHandleSimpleOpt(char **argv, int *pi) shortOpt = argv[*pi][1]; } - 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) - { - 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; + if (scanOptionsTable(optionsTable, shortOpt, longOpt, argv, pi)) + { + return 1; + } + else if (port && port->poptions && + scanOptionsTable(port->poptions, shortOpt, longOpt, argv, pi)) + { + return 1; + } + else + { + return 0; + } } else { @@ -723,7 +800,7 @@ tryHandleSimpleOpt(char **argv, int *pi) /*-----------------------------------------------------------------*/ /* parseCmdLine - parses the command line and sets the options */ /*-----------------------------------------------------------------*/ -int +static int parseCmdLine (int argc, char **argv) { int i; @@ -850,6 +927,19 @@ parseCmdLine (int argc, char **argv) continue; } + if (strcmp (argv[i], OPTION_XRAM_SIZE) == 0) + { + options.xram_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); + options.xram_size_set = TRUE; + continue; + } + + if (strcmp (argv[i], OPTION_CODE_SIZE) == 0) + { + options.code_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); + continue; + } + if (strcmp (argv[i], OPTION_DATA_LOC) == 0) { options.data_loc = getIntArg(OPTION_DATA_LOC, argv, &i, argc); @@ -880,6 +970,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; @@ -898,6 +994,12 @@ parseCmdLine (int argc, char **argv) options.shortis8bits=1; continue; } + + if (strcmp (argv[i], OPTION_TINI_LIBID) == 0) + { + options.tini_libid = getIntArg(OPTION_TINI_LIBID, argv, &i, argc); + continue; + } if (!port->parseOption (&argc, argv, &i)) { @@ -922,8 +1024,12 @@ parseCmdLine (int argc, char **argv) break; case 'm': - /* Used to select the port */ - _setPort (argv[i] + 2); + /* Used to select the port. But this has already been done. */ + break; + + case 'p': + /* Used to select the processor in port. But this has + * already been done. */ break; case 'c': @@ -939,6 +1045,47 @@ parseCmdLine (int argc, char **argv) case 'l': libFiles[nlibFiles++] = getStringArg("-l", argv, &i, argc); break; + + case 'o': + { + char *p; + + /* copy the file name into the buffer */ + strncpyz(buffer, getStringArg("-o", argv, &i, argc), + sizeof(buffer)); + /* point to last character */ + p = buffer + strlen (buffer) - 1; + if (*p == DIR_SEPARATOR_CHAR) + { + /* only output path specified */ + dstPath = Safe_strdup (buffer); + fullDstFileName = NULL; + } + else + { + fullDstFileName = Safe_strdup (buffer); + + /* get rid of the "."-extension */ + + /* is there a dot at all? */ + if (strrchr (buffer, '.') && + /* is the dot in the filename, not in the path? */ + (strrchr (buffer, DIR_SEPARATOR_CHAR) < strrchr (buffer, '.'))) + *strrchr (buffer, '.') = '\0'; + + dstFileName = Safe_strdup (buffer); + + /* strip module name to get path */ + p = strrchr (buffer, DIR_SEPARATOR_CHAR); + if (p) + { + /* path with trailing / */ + p[1] = '\0'; + dstPath = Safe_strdup (buffer); + } + } + break; + } case 'W': /* pre-processer options */ @@ -954,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 { @@ -981,6 +1128,7 @@ parseCmdLine (int argc, char **argv) addToList (preArgv, "-C"); break; } + case 'd': case 'D': case 'I': @@ -993,13 +1141,13 @@ parseCmdLine (int argc, char **argv) if (argv[i][2] == ' ' || argv[i][2] == '\0') { i++; - if (i >= argc) + if (i >= argc) { /* No argument. */ werror(E_ARGUMENT_MISSING, argv[i-1]); break; } - else + else { rest = argv[i]; } @@ -1010,7 +1158,8 @@ parseCmdLine (int argc, char **argv) if (sOpt == 'Y') sOpt = 'I'; - sprintf (buffer, "-%c%s", sOpt, rest); + SNPRINTF (buffer, sizeof(buffer), + ((sOpt == 'I') ? "-%c\"%s\"": "-%c%s"), sOpt, rest); addToList (preArgv, buffer); } break; @@ -1024,29 +1173,101 @@ parseCmdLine (int argc, char **argv) if (!port->parseOption (&argc, argv, &i)) { - /* no option must be a filename */ - if (options.c1mode) - _processC1Arg (argv[i]); - else - 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) + { + 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; + + strncpyz (buffer, relFiles[0], sizeof(buffer)); + /* remove extension (it must be .rel) */ + *strrchr (buffer, '.') = '\0'; + /* remove path */ + objectName = strrchr (buffer, DIR_SEPARATOR_CHAR); + if (objectName) + { + ++objectName; + } + else + { + objectName = buffer; + } + 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 */ } /* set up external stack location if not explicitly specified */ if (!options.xstack_loc) options.xstack_loc = options.xdata_loc; - /* if debug option is set the open the cdbFile */ - if (options.debug && srcFileName) + /* if debug option is set then open the cdbFile */ + if (options.debug && fullSrcFileName) { - sprintf (scratchFileName, "%s.cdb", srcFileName); - if ((cdbFile = fopen (scratchFileName, "w")) == NULL) - werror (E_FILE_OPEN_ERR, scratchFileName); + SNPRINTF (scratchFileName, sizeof(scratchFileName), + "%s.adb", dstFileName); //JCF: Nov 30, 2002 + if(debugFile->openFile(scratchFileName)) + debugFile->writeModule(moduleName); else - { - /* add a module record */ - fprintf (cdbFile, "M:%s\n", moduleName); - } + werror (E_FILE_OPEN_ERR, scratchFileName); } return 0; } @@ -1059,26 +1280,32 @@ linkEdit (char **envp) { FILE *lnkfile; char *segName, *c; - - int i; - if (!srcFileName) - srcFileName = "temp"; + int i, system_ret; /* first we need to create the .lnk file */ - sprintf (scratchFileName, "%s.lnk", srcFileName); + SNPRINTF (scratchFileName, sizeof(scratchFileName), + "%s.lnk", dstFileName); if (!(lnkfile = fopen (scratchFileName, "w"))) { werror (E_FILE_OPEN_ERR, scratchFileName); exit (1); } - /* now write the options */ - fprintf (lnkfile, "-mux%c\n", (options.out_fmt ? 's' : 'i')); + /* now write the options. JCF: added option 'y' */ + fprintf (lnkfile, "-myux%c\n", (options.out_fmt ? 's' : 'i')); /* if iram size specified */ if (options.iram_size) fprintf (lnkfile, "-a 0x%04x\n", options.iram_size); + /* if xram size specified */ + if (options.xram_size_set) + fprintf (lnkfile, "-v 0x%04x\n", options.xram_size); + + /* if code size specified */ + if (options.code_size) + fprintf (lnkfile, "-w 0x%04x\n", options.code_size); + if (options.debug) fprintf (lnkfile, "-z\n"); @@ -1092,17 +1319,26 @@ linkEdit (char **envp) WRITE_SEG_LOC (CODE_NAME, options.code_loc); /* data segment start */ - WRITE_SEG_LOC (DATA_NAME, options.data_loc); + if(options.data_loc){ /*JCF: If zero, the linker chooses the best place for data*/ + WRITE_SEG_LOC (DATA_NAME, options.data_loc); + } /* xdata start */ WRITE_SEG_LOC (XDATA_NAME, options.xdata_loc); /* indirect data */ - WRITE_SEG_LOC (IDATA_NAME, options.idata_loc); + if (IDATA_NAME) { + WRITE_SEG_LOC (IDATA_NAME, options.idata_loc); + } /* bit segment start */ WRITE_SEG_LOC (BIT_NAME, 0); + /* JCF: stack start */ + if ( (options.stack_loc) && (options.stack_loc<0x100) ) { + WRITE_SEG_LOC ("SSEG", options.stack_loc); + } + /* add the extra linker options */ for (i = 0; linkOptions[i]; i++) fprintf (lnkfile, "%s\n", linkOptions[i]); @@ -1114,40 +1350,72 @@ linkEdit (char **envp) /* standard library path */ if (!options.nostdlib) { -/**** - if (TARGET_IS_DS390) - { - c = "ds390"; - } - else -*****/ + switch (options.model) { - switch (options.model) + case MODEL_SMALL: + c = "small"; + break; + case MODEL_LARGE: + c = "large"; + break; + case MODEL_FLAT24: + /* c = "flat24"; */ + if (TARGET_IS_DS390) { - case MODEL_SMALL: - c = "small"; - break; - case MODEL_LARGE: - c = "large"; - break; - case MODEL_FLAT24: - /* c = "flat24"; */ - c = "ds390"; - break; - default: - werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); - c = "unknown"; - break; + 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"; + break; + default: + werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); + c = "unknown"; + break; } mfprintf (lnkfile, getRuntimeVariables(), "-k {libdir}{sep}%s\n", c); /* standard library files */ - /* if (strcmp (port->target, "ds390") == 0) */ +#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 + +#if !OPT_DISABLE_XA51 +#ifdef STD_XA51_LIB + if (options.model == MODEL_PAGE0) + { + fprintf (lnkfile, "-l %s\n", STD_XA51_LIB); + } +#endif +#endif fprintf (lnkfile, "-l %s\n", STD_LIB); fprintf (lnkfile, "-l %s\n", STD_INT_LIB); fprintf (lnkfile, "-l %s\n", STD_LONG_LIB); @@ -1159,8 +1427,8 @@ linkEdit (char **envp) fprintf (lnkfile, "-l %s\n", libFiles[i]); /* put in the object files */ - if (strcmp (srcFileName, "temp")) - fprintf (lnkfile, "%s ", srcFileName); + if (fullSrcFileName) + fprintf (lnkfile, "%s ", dstFileName); for (i = 0; i < nrelFiles; i++) fprintf (lnkfile, "%s\n", relFiles[i]); @@ -1171,29 +1439,91 @@ linkEdit (char **envp) if (options.verbose) printf ("sdcc: Calling linker...\n"); + /* build linker output filename */ + + /* -o option overrides default name? */ + if (fullDstFileName) + { + strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName)); + } + else + { + /* the linked file gets the name of the first modul */ + if (fullSrcFileName) + { + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); + } + else + { + strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName)); + /* strip ".rel" extension */ + *strrchr (scratchFileName, '.') = '\0'; + } + strncatz (scratchFileName, + options.out_fmt ? ".S19" : ".ihx", + sizeof(scratchFileName)); + } + if (port->linker.cmd) { char buffer2[PATH_MAX]; - buildCmdLine (buffer2, port->linker.cmd, srcFileName, NULL, NULL, NULL); - buildCmdLine2 (buffer, buffer2); + buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, NULL); + buildCmdLine2 (buffer, buffer2, sizeof(buffer)); } else { - buildCmdLine2 (buffer, port->linker.mcmd); + buildCmdLine2 (buffer, port->linker.mcmd, sizeof(buffer)); } - if (my_system (buffer)) + system_ret = my_system (buffer); + /* TODO: most linker don't have a -o parameter */ + /* -o option overrides default name? */ + if (fullDstFileName) { - exit (1); - } + char *p, *q; + /* the linked file gets the name of the first modul */ + if (fullSrcFileName) + { + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); + p = strlen (scratchFileName) + scratchFileName; + } + else + { + strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName)); + /* strip ".rel" extension */ + p = strrchr (scratchFileName, '.'); + if (p) + { + *p = 0; + } + } + strncatz (scratchFileName, + options.out_fmt ? ".S19" : ".ihx", + sizeof(scratchFileName)); + rename (scratchFileName, fullDstFileName); + + strncpyz (buffer, fullDstFileName, sizeof(buffer)); + q = strrchr (buffer, '.'); + if (!q) + { + /* no extension: append new extensions */ + q = strlen (buffer) + buffer; + } - if (strcmp (srcFileName, "temp") == 0) + *p = 0; + strncatz (scratchFileName, ".map", sizeof(scratchFileName)); + *q = 0; + strncatz(buffer, ".map", sizeof(buffer)); + rename (scratchFileName, buffer); + *p = 0; + strncatz (scratchFileName, ".mem", sizeof(scratchFileName)); + *q = 0; + strncatz(buffer, ".mem", sizeof(buffer)); + rename (scratchFileName, buffer); + } + if (system_ret) { - /* rename "temp.cdb" to "firstRelFile.cdb" */ - char *f = strtok (Safe_strdup (relFiles[0]), "."); - f = strcat (f, ".cdb"); - rename ("temp.cdb", f); - srcFileName = NULL; + exit (1); } } @@ -1203,23 +1533,43 @@ linkEdit (char **envp) static void assemble (char **envp) { - if (port->assembler.cmd) - { - buildCmdLine (buffer, port->assembler.cmd, srcFileName, NULL, - options.debug ? port->assembler.debug_opts : port->assembler.plain_opts, - asmOptions); + /* build assembler output filename */ + + /* -o option overrides default name? */ + if (options.cc_only && fullDstFileName) { + strncpyz (scratchFileName, fullDstFileName, sizeof(scratchFileName)); + } else { + /* the assembled file gets the name of the first modul */ + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); + strncatz (scratchFileName, port->linker.rel_ext, + sizeof(scratchFileName)); } - else - { - buildCmdLine2 (buffer, port->assembler.mcmd); + + if (port->assembler.do_assemble) { + port->assembler.do_assemble(asmOptions); + return ; + } else if (port->assembler.cmd) { + buildCmdLine (buffer, port->assembler.cmd, dstFileName, scratchFileName, + options.debug ? port->assembler.debug_opts : port->assembler.plain_opts, + asmOptions); + } else { + buildCmdLine2 (buffer, port->assembler.mcmd, sizeof(buffer)); } - if (my_system (buffer)) - { - /* either system() or the assembler itself has reported an error - perror ("Cannot exec assembler"); - */ - exit (1); + if (my_system (buffer)) { + /* either system() or the assembler itself has reported an error + perror ("Cannot exec assembler"); + */ + exit (1); + } + /* TODO: most assembler don't have a -o parameter */ + /* -o option overrides default name? */ + if (options.cc_only && fullDstFileName) { + strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); + strncatz (scratchFileName, + port->linker.rel_ext, + sizeof(scratchFileName)); + rename (scratchFileName, fullDstFileName); } } @@ -1229,9 +1579,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) @@ -1267,6 +1619,9 @@ preProcess (char **envp) case MODEL_FLAT24: addToList (preArgv, "-DSDCC_MODEL_FLAT24"); break; + case MODEL_PAGE0: + addToList (preArgv, "-DSDCC_MODEL_PAGE0"); + break; default: werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); break; @@ -1278,181 +1633,178 @@ preProcess (char **envp) /* standard include path */ if (!options.nostdinc) { - addToList (preArgv, "-I{includedir}"); + addToList (preArgv, "-I\"{includedir}\""); } setMainValue ("cppextraopts", join(preArgv)); - - if (!preProcOnly) - preOutName = Safe_strdup (tempfilename ()); - /* Have to set cppoutfilename to something, even if just pre-processing. */ - setMainValue ("cppoutfilename", preOutName ? preOutName : ""); - + if (preProcOnly && fullDstFileName) + { + /* -E and -o given */ + setMainValue ("cppoutfilename", fullDstFileName); + } + else + { + /* Piping: set cppoutfilename to NULL, to avoid empty quotes */ + setMainValue ("cppoutfilename", NULL); + } + 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; } -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); - strcpy (scratchFileName, pprefix); - strcat (scratchFileName, buffer); - - 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); - strcpy (scratchFileName, pprefix); - strcat (scratchFileName, buffer); + /* 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; + } - return TRUE; + if (options.printSearchDirs) + printf("includedir: %s\n", p); + + 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)) - { - 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 ((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 @@ -1463,8 +1815,55 @@ initValues (void) setMainValue ("objext", port->linker.rel_ext); setMainValue ("asmext", port->assembler.file_ext); + setMainValue ("dstfilename", dstFileName); setMainValue ("fullsrcfilename", fullSrcFileName ? fullSrcFileName : "fullsrcfilename"); - setMainValue ("srcfilename", srcFileName ? srcFileName : "srcfilename"); + + if (options.cc_only && fullDstFileName) + /* compile + assemble and -o given: -o specifies name of object file */ + { + setMainValue ("objdstfilename", fullDstFileName); + } + else + { + setMainValue ("objdstfilename", "{stdobjdstfilename}"); + } + if (fullDstFileName) + /* if we're linking, -o gives the final file name */ + { + setMainValue ("linkdstfilename", fullDstFileName); + } + else + { + setMainValue ("linkdstfilename", "{stdlinkdstfilename}"); + } + +} + +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); } /* @@ -1485,7 +1884,27 @@ main (int argc, char **argv, char **envp) exit (1); } + /* install atexit handler */ + atexit(rm_tmpfiles); + + /* 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). + */ + _findPort (argc, argv); + #ifdef JAMIN_DS390 if (strcmp(port->target, "mcs51") == 0) { printf("DS390 jammed in A\n"); @@ -1493,13 +1912,13 @@ main (int argc, char **argv, char **envp) ds390_jammed = 1; } #endif + + _findProcessor (argc, argv); + /* Initalise the port. */ 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) { @@ -1509,25 +1928,29 @@ 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 && !srcFileName && !nrelFiles) || - (options.c1mode && !srcFileName && !options.out_name)) - { - printUsage (); - exit (0); - } + if (!options.c1mode && !fullSrcFileName && !nrelFiles) { + if (!options.printSearchDirs) + printUsage(); - initValues (); - _discoverPaths (argv[0]); + exit(0); + } - if (srcFileName) + /* initMem() is expensive, but + initMem() must called before port->finaliseOptions (). + And the z80 port needs port->finaliseOptions(), + even if we're only linking. */ + initMem (); + port->finaliseOptions (); + + if (fullSrcFileName || options.c1mode) { preProcess (envp); - initMem (); - - port->finaliseOptions (); - initSymt (); initiCode (); initCSupport (); @@ -1539,76 +1962,44 @@ main (int argc, char **argv, char **envp) yyparse (); - if (!fatalError) - { - if (TARGET_IS_PIC) { - /* TSD PIC port hack - if the PIC port option is enabled - and SDCC is used to generate PIC code, then we will - generate .asm files in gpasm's format instead of SDCC's - assembler's format - */ + pclose(yyin); + deleteSetItem(&pipeSet, yyin); + + if (fatalError) { + exit (1); + } + + if (TARGET_IS_PIC) { + /* TSD PIC port hack - if the PIC port option is enabled + and SDCC is used to generate PIC code, then we will + generate .asm files in gpasm's format instead of SDCC's + assembler's format + */ #if !OPT_DISABLE_PIC - picglue (); + picglue (); #endif - } else { - glue (); - } - - if (fatalError) - { - // @FIX: Dario Vecchio 03-05-2001 - if (preOutName) - { - if (yyin && yyin != stdin) - fclose (yyin); - unlink (preOutName); - Safe_free (preOutName); - } - // EndFix - return 1; - } - if (!options.c1mode && !noAssemble) - { - if (options.verbose) - printf ("sdcc: Calling assembler...\n"); - assemble (envp); - } - } - else - { - // @FIX: Dario Vecchio 03-05-2001 - if (preOutName) - { - if (yyin && yyin != stdin) - fclose (yyin); - unlink (preOutName); - Safe_free (preOutName); - } - // EndFix - #if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER) - rm_tmpfiles(); - #endif - return 1; - } + } + else { + glue (); + } + if (!options.c1mode && !noAssemble) + { + if (options.verbose) + printf ("sdcc: Calling assembler...\n"); + assemble (envp); + } } - closeDumpFiles(); - if (cdbFile) - fclose (cdbFile); - - if (preOutName && !options.c1mode) - { - unlink (preOutName); - Safe_free (preOutName); - } + if (options.debug && debugFile) + debugFile->closeFile(); if (!options.cc_only && !fatalError && !noAssemble && !options.c1mode && - (srcFileName || nrelFiles)) + (fullSrcFileName || nrelFiles)) { if (port->linker.do_link) port->linker.do_link (); @@ -1616,9 +2007,5 @@ main (int argc, char **argv, char **envp) linkEdit (envp); } - if (yyin && yyin != stdin) - fclose (yyin); - return 0; - }