X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=814bae8241b18ecff531c21fa32551f8ab994408;hb=55eadd00cad5f29a448778a687446ec5d6306d47;hp=b052708766e17e8fdfac0c320c38efc1c99067bb;hpb=65e5e80f5bf2965e3bbda6338c703b4b77b6f4d5;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index b0527087..814bae82 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -22,12 +22,12 @@ what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ -#define USE_SYSTEM_SYSTEM_CALLS - #include "common.h" #include #include "newalloc.h" #include "SDCCerr.h" +#include "BuildCmd.h" +#include "MySystem.h" #if NATIVE_WIN32 #include @@ -35,16 +35,8 @@ #include "spawn.h" #endif -// This is a bit messy because we define link ourself #if !defined(__BORLANDC__) && !defined(_MSC_VER) - #include - -#else -// No unistd.h in Borland C++ -extern int access (const char *, int); -#define X_OK 1 - #endif //REMOVE ME!!! @@ -60,8 +52,8 @@ int currRegBank = 0; struct optimize optimize; struct options options; char *VersionString = SDCC_VERSION_STR /*"Version 2.1.8a" */ ; -short preProcOnly = 0; -short noAssemble = 0; +int preProcOnly = 0; +int noAssemble = 0; char *linkOptions[128]; const char *asmOptions[128]; char *libFiles[128]; @@ -73,70 +65,171 @@ 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]; + // In MSC VC6 default search path for exe's to path for this char DefaultExePath[128]; -/* Far functions, far data */ -#define OPTION_LARGE_MODEL "-model-large" -/* Far functions, near data */ -#define OPTION_MEDIUM_MODEL "-model-medium" -#define OPTION_SMALL_MODEL "-model-small" -#define OPTION_FLAT24_MODEL "-model-flat24" -#define OPTION_STACK_AUTO "-stack-auto" -#define OPTION_STACK_10BIT "-stack-10bit" -#define OPTION_XSTACK "-xstack" -#define OPTION_GENERIC "-generic" -#define OPTION_NO_GCSE "-nogcse" -#define OPTION_NO_LOOP_INV "-noinvariant" -#define OPTION_NO_LOOP_IND "-noinduction" -#define OPTION_NO_JTBOUND "-nojtbound" -#define OPTION_NO_LOOPREV "-noloopreverse" -#define OPTION_XREGS "-regextend" -#define OPTION_COMP_ONLY "-compile-only" -#define OPTION_DUMP_RAW "-dumpraw" -#define OPTION_DUMP_GCSE "-dumpgcse" -#define OPTION_DUMP_LOOP "-dumploop" -#define OPTION_DUMP_KILL "-dumpdeadcode" -#define OPTION_DUMP_RANGE "-dumpliverange" -#define OPTION_DUMP_PACK "-dumpregpack" -#define OPTION_DUMP_RASSGN "-dumpregassign" -#define OPTION_DUMP_ALL "-dumpall" -#define OPTION_XRAM_LOC "-xram-loc" -#define OPTION_IRAM_SIZE "-iram-size" -#define OPTION_XSTACK_LOC "-xstack-loc" -#define OPTION_CODE_LOC "-code-loc" -#define OPTION_STACK_LOC "-stack-loc" -#define OPTION_DATA_LOC "-data-loc" -#define OPTION_IDATA_LOC "-idata-loc" -#define OPTION_PEEP_FILE "-peep-file" -#define OPTION_LIB_PATH "-lib-path" -#define OPTION_INTLONG_RENT "-int-long-reent" -#define OPTION_FLOAT_RENT "-float-reent" -#define OPTION_OUT_FMT_IHX "-out-fmt-ihx" -#define OPTION_OUT_FMT_S19 "-out-fmt-s19" -#define OPTION_CYCLOMATIC "-cyclomatic" -#define OPTION_NOOVERLAY "-nooverlay" -#define OPTION_MAINRETURN "-main-return" -#define OPTION_NOPEEP "-no-peep" -#define OPTION_ASMPEEP "-peep-asm" -#define OPTION_DEBUG "-debug" -#define OPTION_NODEBUG "-nodebug" -#define OPTION_VERSION "-version" -#define OPTION_STKAFTRDATA "-stack-after-data" -#define OPTION_PREPROC_ONLY "-preprocessonly" -#define OPTION_C1_MODE "-c1mode" -#define OPTION_HELP "-help" -#define OPTION_CALLEE_SAVES "-callee-saves" -#define OPTION_NOREGPARMS "-noregparms" -#define OPTION_NOSTDLIB "-nostdlib" -#define OPTION_NOSTDINC "-nostdinc" -#define OPTION_VERBOSE "-verbose" -#define OPTION_ANSIINT "-ansiint" +#define OPTION_HELP "-help" + +#define LENGTH(_a) (sizeof(_a)/sizeof(*(_a))) + +#define OPTION_STACK_8BIT "--stack-8bit" +#define OPTION_OUT_FMT_IHX "--out-fmt-ihx" +#define OPTION_LARGE_MODEL "--model-large" +#define OPTION_MEDIUM_MODEL "--model-medium" +#define OPTION_SMALL_MODEL "--model-small" +#define OPTION_FLAT24_MODEL "--model-flat24" +#define OPTION_DUMP_ALL "--dumpall" +#define OPTION_PEEP_FILE "--peep-file" +#define OPTION_LIB_PATH "--lib-path" +#define OPTION_XSTACK_LOC "--xstack-loc" +#define OPTION_CALLEE_SAVES "--callee-saves" +#define OPTION_STACK_LOC "--stack-loc" +#define OPTION_XRAM_LOC "--xram-loc" +#define OPTION_IRAM_SIZE "--iram-size" +#define OPTION_VERSION "--version" +#define OPTION_DATA_LOC "--data-loc" +#define OPTION_CODE_LOC "--code-loc" +#define OPTION_IDATA_LOC "--idata-loc" +#define OPTION_NO_LOOP_INV "--noinvariant" +#define OPTION_NO_LOOP_IND "--noinduction" +#define OPTION_LESS_PEDANTIC "--lesspedantic" +#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 +optionsTable[] = { + { 'm', NULL, NULL, "Set the port to use e.g. -mz80." }, + { 'd', NULL, NULL, NULL }, + { 'D', NULL, NULL, "Define macro as in -Dmacro" }, + { 'I', NULL, NULL, "Add to the include (*.h) path, as in -Ipath" }, + { 'A', NULL, NULL, NULL }, + { '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" }, + { '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" }, + { 0, OPTION_LARGE_MODEL, NULL, "external data space is used" }, + { 0, OPTION_MEDIUM_MODEL, NULL, "not supported" }, + { 0, OPTION_SMALL_MODEL, NULL, "internal data space is used (default)" }, + { 0, OPTION_FLAT24_MODEL, NULL, "use the flat24 model for the ds390 (default)" }, + { 0, "--stack-auto", &options.stackAuto, "Stack automatic variables" }, + { 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_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" }, + { 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 }, + { 0, "--dumpdeadcode", &options.dump_kill, NULL }, + { 0, "--dumpliverange", &options.dump_range, NULL }, + { 0, "--dumpregpack", &options.dump_pack, NULL }, + { 0, "--dumpregassign", &options.dump_rassgn, 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" }, + { 0, OPTION_XSTACK_LOC, NULL, " External Ram start location" }, + { 0, OPTION_CODE_LOC, NULL, " Code Segment Location" }, + { 0, OPTION_STACK_LOC, NULL, " Stack pointer initial value" }, + { 0, OPTION_DATA_LOC, NULL, " Direct data start location" }, + { 0, OPTION_IDATA_LOC, NULL, NULL }, + { 0, OPTION_PEEP_FILE, NULL, " use this extra peep-hole file" }, + { 0, OPTION_LIB_PATH, NULL, " use this path to search for libraries" }, + { 0, "--int-long-reent", &options.intlong_rent, "Use reenterant calls on the int and long support functions" }, + { 0, "--float-reent", &options.float_rent, "Use reenterant calls on the floar support functions" }, + { 0, OPTION_OUT_FMT_IHX, NULL, NULL }, + { 0, "--out-fmt-s19", &options.out_fmt, NULL }, + { 0, "--cyclomatic", &options.cyclomatic, NULL }, + { 0, "--nooverlay", &options.noOverlay, NULL }, + { 0, "--main-return", &options.mainreturn, "Issue a return after main()" }, + { 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, "--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" }, + { 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, "--profile", &options.profile, "On supported ports, generate extra profiling information" } +}; + +/** Table of all unsupported options and help text to display when one + is used. +*/ +typedef struct { + /** shortOpt as in OPTIONS. */ + char shortOpt; + /** longOpt as in OPTIONS. */ + const char *longOpt; + /** Message to display inside W_UNSUPPORTED_OPT when this option + is used. */ + const char *message; +} UNSUPPORTEDOPT; + +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" }, + { 'Y', NULL, "use -I instead" } +}; + static const char *_preCmd[] = { "sdcpp", "-Wall", "-lang-c++", "-DSDCC=1", - "$l", "-I" SDCC_INCLUDE_DIR, "$1", "$2", NULL + "$l", "$1", "$2", NULL }; PORT *port; @@ -159,7 +252,7 @@ static PORT *_ports[] = &ds390_port, #endif #if !OPT_DISABLE_PIC - &pic14_port, + &pic_port, #endif #if !OPT_DISABLE_I186 &i186_port, @@ -174,13 +267,13 @@ static PORT *_ports[] = /** remove me - TSD a hack to force sdcc to generate gpasm format .asm files. */ -extern void pic14glue (); +extern void picglue (); /** Sets the port to the one given by the command line option. @param The name minus the option (eg 'mcs51') @return 0 on success. */ -static int +static void _setPort (const char *name) { int i; @@ -189,7 +282,7 @@ _setPort (const char *name) if (!strcmp (_ports[i]->target, name)) { port = _ports[i]; - return 0; + return; } } /* Error - didnt find */ @@ -197,7 +290,7 @@ _setPort (const char *name) exit (1); } -static void +static void _validatePorts (void) { int i; @@ -205,145 +298,14 @@ _validatePorts (void) { if (_ports[i]->magic != PORT_MAGIC) { - printf ("Error: port %s is incomplete.\n", _ports[i]->target); - wassert (0); - } - } -} - -#ifdef USE_SYSTEM_SYSTEM_CALLS -void -buildCmdLine (char *into, const char **cmds, - const char *p1, const char *p2, - const char *p3, const char **list) -{ - const char *p, *from; - - *into = '\0'; - - while (*cmds) - { - - from = *cmds; - cmds++; - - /* See if it has a '$' anywhere - if not, just copy */ - if ((p = strchr (from, '$'))) - { - strncat (into, from, p - from); - /* seperate it */ - strcat (into, " "); - from = p + 2; - p++; - switch (*p) - { - case '1': - if (p1) - strcat (into, p1); - break; - case '2': - if (p2) - strcat (into, p2); - break; - case '3': - if (p3) - strcat (into, p3); - break; - case 'l': - { - const char **tmp = list; - if (tmp) - { - while (*tmp) - { - strcat (into, *tmp); - strcat (into, " "); - tmp++; - } - } - break; - } - default: - assert (0); - } - } - strcat (into, from); // this includes the ".asm" from "$1.asm" - - strcat (into, " "); - } -} -#else -void -buildCmdLine (char *into, char **args, const char **cmds, - const char *p1, const char *p2, - const char *p3, const char **list) -{ - const char *p, *from; - - while (*cmds) - { - *args = into; - args++; - - from = *cmds; - cmds++; - *into = '\0'; - - /* See if it has a '$' anywhere - if not, just copy */ - if ((p = strchr (from, '$'))) - { - strncpy (into, from, p - from); - /* NULL terminate it */ - into[p - from] = '\0'; - from = p + 2; - p++; - switch (*p) - { - case '1': - if (p1) - strcat (into, p1); - break; - case '2': - if (p2) - strcat (into, p2); - break; - case '3': - if (p3) - strcat (into, p3); - break; - case 'l': - { - const char **tmp = list; - if (tmp) - { - while (*tmp) - { - strcpy (into, *tmp); - into += strlen (into) + 1; - *args = into; - args++; - tmp++; - } - } - break; - } - default: - assert (0); - } + wassertl (0, "Port definition structure is incomplete"); } - strcat (into, from); - if (strlen (into) == 0) - args--; - into += strlen (into) + 1; } - *args = NULL; } -#endif - /*-----------------------------------------------------------------*/ /* printVersionInfo - prints the version info */ /*-----------------------------------------------------------------*/ -void +void printVersionInfo () { int i; @@ -352,19 +314,23 @@ printVersionInfo () "SDCC : "); for (i = 0; i < NUM_PORTS; i++) fprintf (stderr, "%s%s", i == 0 ? "" : "/", _ports[i]->target); + fprintf (stderr, " %s" #ifdef SDCC_SUB_VERSION_STR "/" SDCC_SUB_VERSION_STR #endif - " ` " -#ifdef __CYGWIN32__ - " (CYGWIN32)\n" +#ifdef __CYGWIN__ + " (CYGWIN)\n" #else #ifdef __DJGPP__ " (DJGPP) \n" +#else +#if defined(_MSC_VER) + " (WIN32) \n" #else " (UNIX) \n" #endif +#endif #endif ,VersionString @@ -374,46 +340,36 @@ printVersionInfo () /*-----------------------------------------------------------------*/ /* printUsage - prints command line syntax */ /*-----------------------------------------------------------------*/ -void +void printUsage () { - printVersionInfo (); - fprintf (stderr, - "Usage : [options] filename\n" - "Options :-\n" - "\t-m - Target processor . Default %s\n" - "\t Try --version for supported values of \n" - "\t--model-large - Large Model\n" - "\t--model-small - Small Model (default)\n" - "\t--stack-auto - Stack automatic variables\n" - "\t--xstack - Use external stack\n" - "\t--xram-loc - External Ram start location\n" - "\t--xstack-loc - Xternal Stack Location\n" - "\t--code-loc - Code Segment Location\n" - "\t--stack-loc - Stack pointer initial value\n" - "\t--data-loc - Direct data start location\n" - "\t--idata-loc - Indirect data start location\n" - "\t--iram-size - Internal Ram size\n" - "\t--nojtbound - Don't generate boundary check for jump tables\n" - "\t--generic - All unqualified ptrs converted to '_generic'\n" - "PreProcessor Options :-\n" - "\t-Dmacro - Define Macro\n" - "\t-Ipath - Include \"*.h\" path\n" - "Note: this is NOT a complete list of options see docs for details\n", - _ports[0]->target - ); - exit (0); + int i; + printVersionInfo(); + fprintf (stdout, + "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 : "" + ); + } + exit (0); } /*-----------------------------------------------------------------*/ /* parseWithComma - separates string with comma */ /*-----------------------------------------------------------------*/ -void +void parseWithComma (char **dest, char *src) { int i = 0; - strtok (src, "\n \t"); + strtok (src, "\r\n \t"); /* skip the initial white spaces */ while (isspace (*src)) src++; @@ -435,7 +391,7 @@ parseWithComma (char **dest, char *src) /*-----------------------------------------------------------------*/ /* setDefaultOptions - sets the default options */ /*-----------------------------------------------------------------*/ -static void +static void setDefaultOptions () { int i; @@ -458,6 +414,9 @@ setDefaultOptions () options.nostdlib = 0; options.nostdinc = 0; options.verbose = 0; + options.shortis8bits = 0; + + options.stack10bit=0; /* now for the optimizations */ /* turn on the everything */ @@ -469,13 +428,14 @@ setDefaultOptions () optimize.loopInvariant = 1; optimize.loopInduction = 1; + /* now for the ports */ port->setDefaultOptions (); } /*-----------------------------------------------------------------*/ /* processFile - determines the type of file from the extension */ /*-----------------------------------------------------------------*/ -static void +static void processFile (char *s) { char *fext = NULL; @@ -556,7 +516,7 @@ processFile (char *s) } -static void +static void _processC1Arg (char *s) { if (srcFileName) @@ -574,7 +534,7 @@ _processC1Arg (char *s) } } -static void +static void _addToList (const char **list, const char *str) { /* This is the bad way to do things :) */ @@ -589,7 +549,7 @@ _addToList (const char **list, const char *str) *(++list) = NULL; } -static void +static void _setModel (int model, const char *sz) { if (port->general.supported_models & model) @@ -598,14 +558,149 @@ _setModel (int model, const char *sz) werror (W_UNSUPPORTED_MODEL, sz, port->target); } +/** Gets the string argument to this option. If the option is '--opt' + then for input of '--optxyz' or '--opt xyz' returns xyz. +*/ +static char * +getStringArg(const char *szStart, char **argv, int *pi, int argc) +{ + if (argv[*pi][strlen(szStart)]) + { + return &argv[*pi][strlen(szStart)]; + } + else + { + ++(*pi); + if (*pi >= argc) + { + werror (E_ARGUMENT_MISSING, szStart); + /* Die here rather than checking for errors later. */ + exit(-1); + } + else + { + return argv[*pi]; + } + } +} + +/** Gets the integer argument to this option using the same rules as + getStringArg. +*/ +static int +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) +{ + if (argv[*pi][0] == '-') + { + const char *longOpt = ""; + char shortOpt = -1; + int i; + + if (argv[*pi][1] == '-') + { + // Long option. + longOpt = argv[*pi]; + } + else + { + shortOpt = argv[*pi][1]; + } + for (i = 0; i < LENGTH(unsupportedOptTable); i++) + { + if (unsupportedOptTable[i].shortOpt == shortOpt || + (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 : ' '); + werror (W_UNSUPP_OPTION, buffer, unsupportedOptTable[i].message); + return 1; + } + } + // Didn't find in the table + return 0; + } + else + { + // Not an option, so can't be unsupported :) + return 0; + } +} + +static bool +tryHandleSimpleOpt(char **argv, int *pi) +{ + if (argv[*pi][0] == '-') + { + const char *longOpt = ""; + char shortOpt = -1; + int i; + + if (argv[*pi][1] == '-') + { + // Long option. + longOpt = argv[*pi]; + } + else + { + 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; + } + else + { + // Not an option, so can't be handled. + return 0; + } +} + /*-----------------------------------------------------------------*/ /* parseCmdLine - parses the command line and sets the options */ /*-----------------------------------------------------------------*/ -int +int parseCmdLine (int argc, char **argv) { int i; - char cdbfnbuf[50]; /* go thru all whole command line */ for (i = 1; i < argc; i++) @@ -613,156 +708,62 @@ parseCmdLine (int argc, char **argv) if (i >= argc) break; + if (tryHandleUnsupportedOpt(argv, &i) == TRUE) + { + continue; + } + + if (tryHandleSimpleOpt(argv, &i) == TRUE) + { + continue; + } + /* options */ if (argv[i][0] == '-' && argv[i][1] == '-') { - - if (strcmp (&argv[i][1], OPTION_HELP) == 0) + if (strcmp (argv[i], OPTION_HELP) == 0) { printUsage (); exit (0); } - if (strcmp (&argv[i][1], OPTION_XREGS) == 0) + if (strcmp (argv[i], OPTION_STACK_8BIT) == 0) { - options.regExtend = 1; + options.stack10bit = 0; continue; } - if (strcmp (&argv[i][1], OPTION_LARGE_MODEL) == 0) - { - _setModel (MODEL_LARGE, argv[i]); - continue; - } - - if (strcmp (&argv[i][1], OPTION_MEDIUM_MODEL) == 0) - { - _setModel (MODEL_MEDIUM, argv[i]); - continue; - } - - if (strcmp (&argv[i][1], OPTION_SMALL_MODEL) == 0) - { - _setModel (MODEL_SMALL, argv[i]); - continue; - } - - if (strcmp (&argv[i][1], OPTION_FLAT24_MODEL) == 0) - { - _setModel (MODEL_FLAT24, argv[i]); - continue; - } - - if (strcmp (&argv[i][1], OPTION_STACK_10BIT) == 0) - { - options.stack10bit = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_STACK_AUTO) == 0) - { - options.stackAuto = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_RAW) == 0) - { - options.dump_raw = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_CYCLOMATIC) == 0) - { - options.cyclomatic = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_GCSE) == 0) - { - options.dump_gcse = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_LOOP) == 0) - { - options.dump_loop = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_KILL) == 0) - { - options.dump_kill = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_INTLONG_RENT) == 0) - { - options.intlong_rent = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_FLOAT_RENT) == 0) - { - options.float_rent = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_RANGE) == 0) - { - options.dump_range = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_PACK) == 0) - { - options.dump_pack = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DUMP_RASSGN) == 0) - { - options.dump_rassgn = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_OUT_FMT_IHX) == 0) + if (strcmp (argv[i], OPTION_OUT_FMT_IHX) == 0) { options.out_fmt = 0; continue; } - if (strcmp (&argv[i][1], OPTION_OUT_FMT_S19) == 0) + if (strcmp (argv[i], OPTION_LARGE_MODEL) == 0) { - options.out_fmt = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NOOVERLAY) == 0) - { - options.noOverlay = 1; + _setModel (MODEL_LARGE, argv[i]); continue; } - if (strcmp (&argv[i][1], OPTION_STKAFTRDATA) == 0) + if (strcmp (argv[i], OPTION_MEDIUM_MODEL) == 0) { - options.stackOnData = 1; + _setModel (MODEL_MEDIUM, argv[i]); continue; } - if (strcmp (&argv[i][1], OPTION_PREPROC_ONLY) == 0) + if (strcmp (argv[i], OPTION_SMALL_MODEL) == 0) { - preProcOnly = 1; + _setModel (MODEL_SMALL, argv[i]); continue; } - if (strcmp (&argv[i][1], OPTION_C1_MODE) == 0) + if (strcmp (argv[i], OPTION_FLAT24_MODEL) == 0) { - options.c1mode = 1; + _setModel (MODEL_FLAT24, argv[i]); continue; } - - if (strcmp (&argv[i][1], OPTION_DUMP_ALL) == 0) + if (strcmp (argv[i], OPTION_DUMP_ALL) == 0) { options.dump_rassgn = options.dump_pack = @@ -774,236 +775,103 @@ parseCmdLine (int argc, char **argv) continue; } - if (strcmp (&argv[i][1], OPTION_COMP_ONLY) == 0) + if (strcmp (argv[i], OPTION_PEEP_FILE) == 0) { - options.cc_only = 1; - continue; + options.peep_file = getStringArg(OPTION_PEEP_FILE, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_GENERIC) == 0) - { - options.genericPtr = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NOPEEP) == 0) - { - options.nopeep = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_ASMPEEP) == 0) - { - options.asmpeep = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_DEBUG) == 0) - { - options.debug = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NODEBUG) == 0) - { - options.nodebug = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NOREGPARMS) == 0) - { - options.noregparms = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_PEEP_FILE) == 0) - { - if (argv[i][1 + strlen (OPTION_PEEP_FILE)]) - options.peep_file = - &argv[i][1 + strlen (OPTION_PEEP_FILE)]; - else - options.peep_file = argv[++i]; - continue; - } - - if (strcmp (&argv[i][1], OPTION_LIB_PATH) == 0) - { - if (argv[i][1 + strlen (OPTION_LIB_PATH)]) - libPaths[nlibPaths++] = - &argv[i][1 + strlen (OPTION_PEEP_FILE)]; - else - libPaths[nlibPaths++] = argv[++i]; - continue; + if (strcmp (argv[i], OPTION_LIB_PATH) == 0) + { + libPaths[nlibPaths++] = getStringArg(OPTION_LIB_PATH, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_XSTACK_LOC) == 0) + if (strcmp (argv[i], OPTION_VERSION) == 0) { - - if (argv[i][1 + strlen (OPTION_XSTACK_LOC)]) - options.xstack_loc = - (int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_XSTACK_LOC)])); - else - options.xstack_loc = - (int) floatFromVal (constVal (argv[++i])); + printVersionInfo (); + exit (0); continue; } - if (strcmp (&argv[i][1], OPTION_XSTACK) == 0) + if (strcmp (argv[i], OPTION_CALLEE_SAVES) == 0) { - options.useXstack = 1; - continue; + parseWithComma (options.calleeSaves, getStringArg(OPTION_CALLEE_SAVES, argv, &i, argc)); + continue; } - if (strcmp (&argv[i][1], OPTION_MAINRETURN) == 0) + if (strcmp (argv[i], OPTION_XSTACK_LOC) == 0) { - options.mainreturn = 1; - continue; + options.xstack_loc = getIntArg(OPTION_XSTACK_LOC, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_CALLEE_SAVES) == 0) + if (strcmp (argv[i], OPTION_STACK_LOC) == 0) { - if (argv[i][1 + strlen (OPTION_CALLEE_SAVES)]) - parseWithComma (options.calleeSaves - ,&argv[i][1 + strlen (OPTION_CALLEE_SAVES)]); - else - parseWithComma (options.calleeSaves, argv[++i]); - continue; + options.stack_loc = getIntArg(OPTION_STACK_LOC, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_STACK_LOC) == 0) + if (strcmp (argv[i], OPTION_XRAM_LOC) == 0) { - - if (argv[i][1 + strlen (OPTION_STACK_LOC)]) - options.stack_loc = - (int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_STACK_LOC)])); - else - options.stack_loc = - (int) floatFromVal (constVal (argv[++i])); - continue; + options.xdata_loc = getIntArg(OPTION_XRAM_LOC, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_XRAM_LOC) == 0) + if (strcmp (argv[i], OPTION_IRAM_SIZE) == 0) { - - if (argv[i][1 + strlen (OPTION_XRAM_LOC)]) - options.xdata_loc = - (unsigned int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_XRAM_LOC)])); - else - options.xdata_loc = - (unsigned int) floatFromVal (constVal (argv[++i])); - continue; + options.iram_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_IRAM_SIZE) == 0) + if (strcmp (argv[i], OPTION_DATA_LOC) == 0) { - - if (argv[i][1 + strlen (OPTION_IRAM_SIZE)]) - options.iram_size = - (int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_IRAM_SIZE)])); - else - options.iram_size = - (int) floatFromVal (constVal (argv[++i])); - continue; + options.data_loc = getIntArg(OPTION_DATA_LOC, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_VERSION) == 0) + if (strcmp (argv[i], OPTION_IDATA_LOC) == 0) { - printVersionInfo (); - exit (0); - continue; + options.idata_loc = getIntArg(OPTION_IDATA_LOC, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_DATA_LOC) == 0) + if (strcmp (argv[i], OPTION_CODE_LOC) == 0) { - - if (argv[i][1 + strlen (OPTION_DATA_LOC)]) - options.data_loc = - (int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_DATA_LOC)])); - else - options.data_loc = - (int) floatFromVal (constVal (argv[++i])); - continue; + options.code_loc = getIntArg(OPTION_CODE_LOC, argv, &i, argc); + continue; } - if (strcmp (&argv[i][1], OPTION_IDATA_LOC) == 0) - { - - if (argv[i][1 + strlen (OPTION_IDATA_LOC)]) - options.idata_loc = - (int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_IDATA_LOC)])); - else - options.idata_loc = - (int) floatFromVal (constVal (argv[++i])); - continue; - } - - if (strcmp (&argv[i][1], OPTION_CODE_LOC) == 0) - { - - if (argv[i][1 + strlen (OPTION_CODE_LOC)]) - options.code_loc = - (int) floatFromVal (constVal (&argv[i][1 + strlen (OPTION_CODE_LOC)])); - else - options.code_loc = - (int) floatFromVal (constVal (argv[++i])); - continue; - } - - - if (strcmp (&argv[i][1], OPTION_NO_JTBOUND) == 0) - { - optimize.noJTabBoundary = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NO_GCSE) == 0) + if (strcmp (argv[i], OPTION_NO_GCSE) == 0) { optimize.global_cse = 0; continue; } - if (strcmp (&argv[i][1], OPTION_NO_LOOP_INV) == 0) + if (strcmp (argv[i], OPTION_NO_LOOP_INV) == 0) { optimize.loopInvariant = 0; continue; } - if (strcmp (&argv[i][1], OPTION_NO_LOOP_IND) == 0) + if (strcmp (argv[i], OPTION_NO_LOOP_IND) == 0) { optimize.loopInduction = 0; continue; } - if (strcmp (&argv[i][1], OPTION_NO_LOOPREV) == 0) - { - optimize.noLoopReverse = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NOSTDLIB) == 0) - { - options.nostdlib = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_NOSTDINC) == 0) - { - options.nostdinc = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_VERBOSE) == 0) - { - options.verbose = 1; - continue; - } - - if (strcmp (&argv[i][1], OPTION_ANSIINT) == 0) - { - options.ANSIint = 1; - continue; - } - + if (strcmp (argv[i], OPTION_LESS_PEDANTIC) == 0) + { + setErrorLogLevel(ERROR_LEVEL_WARNING); + continue; + } + + if (strcmp (&argv[i][1], OPTION_SHORT_IS_8BITS) == 0) + { + options.shortis8bits=1; + continue; + } + if (!port->parseOption (&argc, argv, &i)) { werror (W_UNKNOWN_OPTION, argv[i]); @@ -1014,155 +882,49 @@ parseCmdLine (int argc, char **argv) } } - /* these are undocumented options */ - /* if preceded by '/' then turn off certain optmizations, used - for debugging only these are also the legacy options from - version 1.xx will be removed gradually. - It may be an absolute filename. - */ - if (*argv[i] == '/' && strlen (argv[i]) < 3) - { - switch (argv[i][1]) - { - - case 'p': - optimize.ptrArithmetic = 0; - break; - - case 'L': - switch (argv[i][2]) - { - case '\0': - optimize.label1 = - optimize.label2 = - optimize.label3 = - optimize.label4 = 0; - break; - case '1': - optimize.label1 = 0; - break; - case '2': - optimize.label2 = 0; - break; - case '3': - optimize.label3 = 0; - break; - case '4': - optimize.label4 = 0; - break; - } - break; - - case 'l': - switch (argv[i][2]) - { - case 'i': - optimize.loopInvariant = 0; - break; - case 'n': - optimize.loopInduction = 0; - break; - - - } - break; - case 'g': - optimize.global_cse = 0; - break; - - } - continue; - } - /* if preceded by '-' then option */ if (*argv[i] == '-') { switch (argv[i][1]) { case 'h': + verifyShortOption(argv[i]); + printUsage (); exit (0); break; - case 'E': - preProcOnly = 1; - break; - case 'm': /* Used to select the port */ - if (_setPort (argv[i] + 2)) - { - werror (W_UNSUPP_OPTION, "-m", "Unrecognised processor"); - } - break; - - case 'a': - werror (W_UNSUPP_OPTION, "-a", "use --stack-auto instead"); - break; - - case 'g': - werror (W_UNSUPP_OPTION, "-g", "use --generic instead"); - break; - - case 'X': /* use external stack */ - werror (W_UNSUPP_OPTION, "-X", "use --xstack-loc instead"); - break; - - case 'x': - werror (W_UNSUPP_OPTION, "-x", "use --xstack instead"); - break; - - case 'p': /* stack pointer intial value */ - case 'P': - werror (W_UNSUPP_OPTION, "-p", "use --stack-loc instead"); - break; - - case 'i': - werror (W_UNSUPP_OPTION, "-i", "use --idata-loc instead"); - break; - - case 'r': - werror (W_UNSUPP_OPTION, "-r", "use --xdata-loc instead"); - break; - - case 's': - werror (W_UNSUPP_OPTION, "-s", "use --code-loc instead"); + _setPort (argv[i] + 2); break; case 'c': - options.cc_only = 1; - break; + verifyShortOption(argv[i]); - case 'Y': - werror (W_UNSUPP_OPTION, "-Y", "use -I instead"); + options.cc_only = 1; break; case 'L': - if (argv[i][2]) - libPaths[nlibPaths++] = &argv[i][2]; - else - libPaths[nlibPaths++] = argv[++i]; - break; + libPaths[nlibPaths++] = getStringArg("-L", argv, &i, argc); + break; + + case 'l': + libFiles[nlibFiles++] = getStringArg("-l", argv, &i, argc); + break; case 'W': /* linker options */ if (argv[i][2] == 'l') { - if (argv[i][3]) - parseWithComma (linkOptions, &argv[i][3]); - else - parseWithComma (linkOptions, argv[++i]); + parseWithComma(linkOptions, getStringArg("-Wl", argv, &i, argc)); } else { /* assembler options */ if (argv[i][2] == 'a') { - if (argv[i][3]) - parseWithComma ((char **) asmOptions, &argv[i][3]); - else - parseWithComma ((char **) asmOptions, argv[++i]); - + parseWithComma ((char **) asmOptions, getStringArg("-Wa", argv, &i, argc)); } else { @@ -1170,15 +932,10 @@ parseCmdLine (int argc, char **argv) } } break; - case 'S': - noAssemble = 1; - break; - - case 'V': - verboseExec = TRUE; - break; case 'v': + verifyShortOption(argv[i]); + printVersionInfo (); exit (0); break; @@ -1207,13 +964,22 @@ parseCmdLine (int argc, char **argv) if (argv[i][2] == ' ' || argv[i][2] == '\0') { i++; - rest = argv[i]; + if (i >= argc) + { + /* No argument. */ + werror(E_ARGUMENT_MISSING, argv[i-1]); + break; + } + else + { + rest = argv[i]; + } } else rest = &argv[i][2]; - if (argv[i][1] == 'Y') - argv[i][1] = 'I'; + if (sOpt == 'Y') + sOpt = 'I'; sprintf (buffer, "-%c%s", sOpt, rest); _addToList (preArgv, buffer); @@ -1242,11 +1008,11 @@ parseCmdLine (int argc, char **argv) options.xstack_loc = options.xdata_loc; /* if debug option is set the open the cdbFile */ - if (!options.nodebug && srcFileName) + if (options.debug && srcFileName) { - sprintf (cdbfnbuf, "%s.cdb", srcFileName); - if ((cdbFile = fopen (cdbfnbuf, "w")) == NULL) - werror (E_FILE_OPEN_ERR, cdbfnbuf); + sprintf (scratchFileName, "%s.cdb", srcFileName); + if ((cdbFile = fopen (scratchFileName, "w")) == NULL) + werror (E_FILE_OPEN_ERR, scratchFileName); else { /* add a module record */ @@ -1256,166 +1022,13 @@ parseCmdLine (int argc, char **argv) return 0; } -/*-----------------------------------------------------------------*/ -/* my_system - will call a program with arguments */ -/*-----------------------------------------------------------------*/ - -#if defined(_MSC_VER) - -char *try_dir[] = -{DefaultExePath, NULL}; // TODO : Fill in some default search list - -#else - -//char *try_dir[]= {SRCDIR "/bin",PREFIX "/bin", NULL}; -char *try_dir[] = -{NULL, NULL}; /* First entry may be overwritten, so use two. */ - -#endif - -#ifdef USE_SYSTEM_SYSTEM_CALLS -int -my_system (const char *cmd) -{ - int argsStart, e, i = 0; - char *cmdLine = NULL; - - argsStart = strstr (cmd, " ") - cmd; - - // try to find the command in predefined path's - while (try_dir[i]) - { - cmdLine = (char *) malloc (strlen (try_dir[i]) + strlen (cmd) + 10); - strcpy (cmdLine, try_dir[i]); // the path - - strcat (cmdLine, "/"); - strncat (cmdLine, cmd, argsStart); // the command -#if NATIVE_WIN32 - strcat (cmdLine, ".exe"); - /* Mung slashes into backslashes to keep WIndoze happy. */ - { - char *r = cmdLine; - while (*r) - { - if (*r == '/') - { - *r = '\\'; - } - r++; - } - } -#endif - if (access (cmdLine, X_OK) == 0) - { - // the arguments - strcat (cmdLine, cmd + argsStart); - break; - } - free (cmdLine); - cmdLine = NULL; - i++; - } - - if (verboseExec) - { - printf ("+ %s\n", cmdLine ? cmdLine : cmd); - } - - if (cmdLine) - { - // command found in predefined path - e = system (cmdLine); - free (cmdLine); - } - else - { - // trust on $PATH - e = system (cmd); - } - return e; -} - -#else - -int -my_system (const char *cmd, char **cmd_argv) -{ - char *dir, *got = NULL; - int i = 0; - - while (!got && try_dir[i]) - { - dir = (char *) Safe_malloc (strlen (try_dir[i]) + strlen (cmd) + 10); - strcpy (dir, try_dir[i]); - strcat (dir, "/"); - strcat (dir, cmd); - -#if NATIVE_WIN32 - strcat (dir, ".exe"); - - /* Mung slashes into backslashes to keep WIndoze happy. */ - { - char *r; - r = dir; - - while (*r) - { - if (*r == '/') - { - *r = '\\'; - } - r++; - } - } -#endif - - if (access (dir, X_OK) == 0) - { - got = strdup (dir); - } - free (dir); - i++; - } - - if (verboseExec) - { - char **pCmd = cmd_argv; - printf ("+ "); - while (*pCmd) - { - printf ("%s ", *pCmd); - pCmd++; - } - printf ("\n"); - } - - if (got) - { - i = spawnv (P_WAIT, got, cmd_argv) == -1; - free (got); - } - else - i = spawnvp (P_WAIT, cmd, cmd_argv) == -1; - if (i) - { - perror ("Cannot exec process "); - return -1; - } - - return 0; -} -#endif - /*-----------------------------------------------------------------*/ /* linkEdit : - calls the linkage editor with options */ /*-----------------------------------------------------------------*/ -static void +static void linkEdit (char **envp) { FILE *lnkfile; -#ifndef USE_SYSTEM_SYSTEM_CALLS - char *argv[128]; -#endif char *segName, *c; int i; @@ -1423,10 +1036,10 @@ linkEdit (char **envp) srcFileName = "temp"; /* first we need to create the .lnk file */ - sprintf (buffer, "%s.lnk", srcFileName); - if (!(lnkfile = fopen (buffer, "w"))) + sprintf (scratchFileName, "%s.lnk", srcFileName); + if (!(lnkfile = fopen (scratchFileName, "w"))) { - werror (E_FILE_OPEN_ERR, buffer); + werror (E_FILE_OPEN_ERR, scratchFileName); exit (1); } @@ -1437,8 +1050,8 @@ linkEdit (char **envp) if (options.iram_size) fprintf (lnkfile, "-a 0x%04x\n", options.iram_size); - /*if (options.debug) */ - fprintf (lnkfile, "-z\n"); + if (options.debug) + fprintf (lnkfile, "-z\n"); #define WRITE_SEG_LOC(N, L) \ segName = strdup(N); \ @@ -1472,11 +1085,13 @@ linkEdit (char **envp) /* standard library path */ if (!options.nostdlib) { - if (IS_DS390_PORT) +/**** + if (TARGET_IS_DS390) { c = "ds390"; } else +*****/ { switch (options.model) { @@ -1487,7 +1102,8 @@ linkEdit (char **envp) c = "large"; break; case MODEL_FLAT24: - c = "flat24"; + /* c = "flat24"; */ + c = "ds390"; break; default: werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); @@ -1498,7 +1114,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); } @@ -1525,22 +1142,11 @@ linkEdit (char **envp) if (options.verbose) printf ("sdcc: Calling linker...\n"); -#ifdef USE_SYSTEM_SYSTEM_CALLS buildCmdLine (buffer, port->linker.cmd, srcFileName, NULL, NULL, NULL); if (my_system (buffer)) { - perror ("Cannot exec linker"); exit (1); } -#else - buildCmdLine (buffer, argv, port->linker.cmd, srcFileName, NULL, NULL, NULL); - if (my_system (argv[0], argv)) - { - perror ("Cannot exec linker"); - exit (1); - } - -#endif if (strcmp (srcFileName, "temp") == 0) { @@ -1555,27 +1161,17 @@ linkEdit (char **envp) /*-----------------------------------------------------------------*/ /* assemble - spawns the assembler with arguments */ /*-----------------------------------------------------------------*/ -static void +static void assemble (char **envp) { -#ifdef USE_SYSTEM_SYSTEM_CALLS buildCmdLine (buffer, port->assembler.cmd, srcFileName, NULL, NULL, asmOptions); if (my_system (buffer)) { - perror ("Cannot exec assembler"); - exit (1); - } -#else - char *argv[128]; /* assembler arguments */ - - buildCmdLine (buffer, argv, port->assembler.cmd, srcFileName, NULL, NULL, asmOptions); - - if (my_system (argv[0], argv)) - { - perror ("Cannot exec assembler"); + /* either system() or the assembler itself has reported an error + perror ("Cannot exec assembler"); + */ exit (1); } -#endif } @@ -1583,12 +1179,9 @@ assemble (char **envp) /*-----------------------------------------------------------------*/ /* preProcess - spawns the preprocessor with arguments */ /*-----------------------------------------------------------------*/ -static int +static int preProcess (char **envp) { -#ifndef USE_SYSTEM_SYSTEM_CALLS - char *argv[128]; -#endif char procDef[128]; preOutName = NULL; @@ -1630,10 +1223,16 @@ preProcess (char **envp) break; } + /* standard include path */ + if (!options.nostdinc) { + _addToList (preArgv, "-I" SDCC_INCLUDE_DIR); + } /* add port (processor information to processor */ sprintf (procDef, "-DSDCC_%s", port->target); _addToList (preArgv, procDef); + sprintf (procDef, "-D__%s", port->target); + _addToList (preArgv, procDef); if (!preProcOnly) preOutName = strdup (tmpnam (NULL)); @@ -1641,28 +1240,24 @@ preProcess (char **envp) if (options.verbose) printf ("sdcc: Calling preprocessor...\n"); -#ifdef USE_SYSTEM_SYSTEM_CALLS buildCmdLine (buffer, _preCmd, fullSrcFileName, preOutName, srcFileName, preArgv); if (my_system (buffer)) { - perror ("Cannot exec Preprocessor"); + // @FIX: Dario Vecchio 03-05-2001 + if (preOutName) + { + unlink (preOutName); + free (preOutName); + } + // EndFix exit (1); } -#else - buildCmdLine (buffer, argv, _preCmd, fullSrcFileName, - preOutName, srcFileName, preArgv); - if (my_system (argv[0], argv)) - { - unlink (preOutName); - perror ("Cannot exec Preprocessor"); - exit (1); - } - -#endif if (preProcOnly) + { exit (0); + } } else { @@ -1679,13 +1274,12 @@ preProcess (char **envp) return 0; } -static void +static void _findPort (int argc, char **argv) { _validatePorts (); - argc--; - while (argc) + while (argc--) { if (!strncmp (*argv, "-m", 2)) { @@ -1693,7 +1287,6 @@ _findPort (int argc, char **argv) return; } argv++; - argc--; } /* Use the first in the list */ port = _ports[0]; @@ -1704,7 +1297,7 @@ _findPort (int argc, char **argv) * initialises and calls the parser */ -int +int main (int argc, char **argv, char **envp) { /* turn all optimizations off by default */ @@ -1712,50 +1305,52 @@ main (int argc, char **argv, char **envp) /*printVersionInfo (); */ + if (NUM_PORTS==0) { + fprintf (stderr, "Build error: no ports are enabled.\n"); + exit (1); + } + _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 (); -#if defined(_MSC_VER) - - { - int i; + // Create a default exe search path from the path to the sdcc command - // Create a default exe search path from the path to the sdcc command - strcpy (DefaultExePath, argv[0]); - for (i = strlen (DefaultExePath); i > 0; i--) - if (DefaultExePath[i] == '\\') - { - DefaultExePath[i] = '\0'; - break; - } + if (strchr (argv[0], DIR_SEPARATOR_CHAR)) + { + strcpy (DefaultExePath, argv[0]); + *(strrchr (DefaultExePath, DIR_SEPARATOR_CHAR)) = 0; + ExePathList[0] = DefaultExePath; + } - if (i == 0) - DefaultExePath[0] = '\0'; - } -#else - if (strchr(argv[0], '/')) - { - strcpy(DefaultExePath, argv[0]); - *(strrchr(DefaultExePath, '/')) = 0; - try_dir[0] = DefaultExePath; + setDefaultOptions (); +#ifdef JAMIN_DS390 + if (ds390_jammed) { + options.model = MODEL_SMALL; + options.stack10bit=0; } - #endif - - setDefaultOptions (); parseCmdLine (argc, argv); - initMem (); - - port->finaliseOptions (); - + if (getenv("SDCPP")) + { + _preCmd[0] = getenv("SDCPP"); + } + /* if no input then printUsage & exit */ - if ((!options.c1mode && !srcFileName && !nrelFiles) || (options.c1mode && !srcFileName && !options.out_name)) + if ((!options.c1mode && !srcFileName && !nrelFiles) || + (options.c1mode && !srcFileName && !options.out_name)) { printUsage (); exit (0); @@ -1765,6 +1360,10 @@ main (int argc, char **argv, char **envp) { preProcess (envp); + initMem (); + + port->finaliseOptions (); + initSymt (); initiCode (); initCSupport (); @@ -1777,39 +1376,69 @@ main (int argc, char **argv, char **envp) if (!fatalError) { -/* 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 (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 - if (IS_PIC_PORT) - pic14glue (); - else + picglue (); #endif + } else { glue (); + } + if (fatalError) { + // @FIX: Dario Vecchio 03-05-2001 + if (preOutName) + { + if (yyin && yyin != stdin) + fclose (yyin); + unlink (preOutName); + free (preOutName); + } + // EndFix return 1; } - if (!options.c1mode) + 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); + free (preOutName); + } + // EndFix + #if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER) + rm_tmpfiles(); + #endif return 1; } } + closeDumpFiles(); + if (cdbFile) fclose (cdbFile); + if (preOutName && !options.c1mode) + { + unlink (preOutName); + free (preOutName); + } + if (!options.cc_only && !fatalError && !noAssemble && @@ -1825,12 +1454,6 @@ main (int argc, char **argv, char **envp) if (yyin && yyin != stdin) fclose (yyin); - if (preOutName && !options.c1mode) - { - unlink (preOutName); - free (preOutName); - } - return 0; }