X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=9d6a445d4ba114194e796e25b5a3a6be9ab7155d;hb=998bc7b7fc11e191943ed839f790fff34b78df3b;hp=784f2913ced4504c09b9e25911367bb08c9a8df5;hpb=3270f325cf2270f7656186324330c4ee3b9c9515;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 784f2913..9d6a445d 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -64,6 +64,7 @@ char *moduleName; /* module name is same as module name base, but /* non-alphanumeric characters replaced with underscore */ int currRegBank = 0; int RegBankUsed[4] = {1, 0, 0, 0}; /*JCF: Reg Bank 0 used by default*/ +int BitBankUsed; /* MB: overlayable bit bank */ struct optimize optimize; struct options options; int preProcOnly = 0; @@ -76,6 +77,7 @@ set *libPathsSet = NULL; set *relFilesSet = NULL; set *dataDirsSet = NULL; /* list of data search directories */ set *includeDirsSet = NULL; /* list of include search directories */ +set *userIncDirsSet = NULL; /* list of user include directories */ set *libDirsSet = NULL; /* list of lib search directories */ /* uncomment JAMIN_DS390 to always override and use ds390 port @@ -95,6 +97,7 @@ char buffer[PATH_MAX * 2]; #define OPTION_STACK_8BIT "--stack-8bit" #define OPTION_OUT_FMT_IHX "--out-fmt-ihx" +#define OPTION_OUT_FMT_S19 "--out-fmt-s19" #define OPTION_LARGE_MODEL "--model-large" #define OPTION_MEDIUM_MODEL "--model-medium" #define OPTION_SMALL_MODEL "--model-small" @@ -102,15 +105,18 @@ char buffer[PATH_MAX * 2]; #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_XSTACK_LOC "--xstack-loc" +#define OPTION_DATA_LOC "--data-loc" +#define OPTION_IDATA_LOC "--idata-loc" #define OPTION_XRAM_LOC "--xram-loc" +#define OPTION_CODE_LOC "--code-loc" +#define OPTION_STACK_SIZE "--stack-size" #define OPTION_IRAM_SIZE "--iram-size" +#define OPTION_XRAM_SIZE "--xram-size" +#define OPTION_CODE_SIZE "--code-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_LABEL_OPT "--nolabelopt" #define OPTION_NO_LOOP_INV "--noinvariant" #define OPTION_NO_LOOP_IND "--noinduction" @@ -120,21 +126,30 @@ char buffer[PATH_MAX * 2]; #define OPTION_SHORT_IS_8BITS "--short-is-8bits" #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" #define OPTION_MSVC_ERROR_STYLE "--vc" #define OPTION_USE_STDOUT "--use-stdout" -#define OPTION_STACK_SIZE "--stack-size" #define OPTION_PACK_IRAM "--pack-iram" +#define OPTION_NO_PACK_IRAM "--no-pack-iram" #define OPTION_NO_PEEP_COMMENTS "--no-peep-comments" +#define OPTION_OPT_CODE_SPEED "--opt-code-speed" +#define OPTION_OPT_CODE_SIZE "--opt-code-size" +#define OPTION_STD_C89 "--std-c89" +#define OPTION_STD_C99 "--std-c99" +#define OPTION_STD_SDCC89 "--std-sdcc89" +#define OPTION_STD_SDCC99 "--std-sdcc99" +#define OPTION_CODE_SEG "--codeseg" +#define OPTION_CONST_SEG "--constseg" 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" }, + { 0, NULL, NULL, "General options" }, + { 0, "--help", NULL, "Display this help" }, + { 'v', OPTION_VERSION, NULL, "Display sdcc's version" }, + { 0, "--verbose", &options.verbose, "Trace calls to the preprocessor, assembler, and linker" }, + { 'V', NULL, &options.verboseExec, "Execute verbosely. Show sub commands as they are run" }, { 'd', NULL, NULL, NULL }, { 'D', NULL, NULL, "Define macro as in -Dmacro" }, { 'I', NULL, NULL, "Add to the include (*.h) path, as in -Ipath" }, @@ -142,74 +157,44 @@ optionsTable[] = { { 'U', NULL, NULL, NULL }, { 'C', NULL, NULL, "Preprocessor option" }, { 'M', NULL, NULL, "Preprocessor option" }, - { '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" }, - { 'l', NULL, NULL, "Include the given library in the link" }, + { 'S', NULL, &noAssemble, "Compile only; do not assemble or link" }, + { 'c', "--compile-only", &options.cc_only, "Compile and assemble, but do not link" }, + { 'E', "--preprocessonly", &preProcOnly, "Preprocess only, do not compile" }, + { 0, "--c1mode", &options.c1mode, "Act in c1 mode. The standard input is preprocessed code, the output is assembly code." }, + { 'o', NULL, NULL, "Place the output into the given path resp. file" }, + { 0, OPTION_PRINT_SEARCH_DIRS, &options.printSearchDirs, "display the directories in the compiler's search path"}, + { 0, OPTION_MSVC_ERROR_STYLE, &options.vc_err_style, "messages are compatible with Micro$oft visual studio"}, + { 0, OPTION_USE_STDOUT, &options.use_stdout, "send errors to stdout instead of stderr"}, + { 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, OPTION_LESS_PEDANTIC, NULL, "Disable some of the more pedantic warnings" }, + { 0, OPTION_DISABLE_WARNING, NULL, " Disable specific warning" }, + { 0, "--debug", &options.debug, "Enable debugging symbol output" }, + { 0, "--cyclomatic", &options.cyclomatic, "Display complexity of compiled functions" }, + { 0, OPTION_STD_C89, NULL, "Use C89 standard only" }, + { 0, OPTION_STD_SDCC89, NULL, "Use C89 standard with SDCC extensions (default)" }, + { 0, OPTION_STD_C99, NULL, "Use C99 standard only (incomplete)" }, + { 0, OPTION_STD_SDCC99, NULL, "Use C99 standard with SDCC extensions (incomplete)" }, + + { 0, NULL, NULL, "Code generation options"}, + { 'm', NULL, NULL, "Set the port to use e.g. -mz80." }, + { 'p', NULL, NULL, "Select port specific processor e.g. -mpic14 -p16f84" }, { 0, OPTION_LARGE_MODEL, NULL, "external data space is used" }, - { 0, OPTION_MEDIUM_MODEL, NULL, "not supported" }, + { 0, OPTION_MEDIUM_MODEL, NULL, "external paged data space is used" }, { 0, OPTION_SMALL_MODEL, NULL, "internal data space is used (default)" }, #if !OPT_DISABLE_DS390 { 0, OPTION_FLAT24_MODEL, NULL, "use the flat24 model for the ds390 (default)" }, -#endif - { 0, "--stack-auto", &options.stackAuto, "Stack automatic variables" }, -#if !OPT_DISABLE_DS390 { 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)" }, #endif + { 0, "--stack-auto", &options.stackAuto, "Stack automatic variables" }, { 0, "--xstack", &options.useXstack, "Use external stack" }, - { 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 }, - { 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, "--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 }, - { 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 float 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, "--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" }, - { 'E', "--preprocessonly", &preProcOnly, "Preprocess only, do not compile" }, - { 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" }, - { 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_DISABLE_WARNING, NULL, " Disable specific warning" }, - { 0, OPTION_SHORT_IS_8BITS, NULL, "Make short 8bits (for old times sake)" }, { 0, "--profile", &options.profile, "On supported ports, generate extra profiling information" }, { 0, "--fommit-frame-pointer", &options.ommitFramePtr, "Leave out the frame pointer." }, { 0, "--all-callee-saves", &options.all_callee_saves, "callee will always save registers used" }, @@ -225,19 +210,65 @@ optionsTable[] = { #endif #if !OPT_DISABLE_DS390 || !OPT_DISABLE_MCS51 { 0, "--parms-in-bank1", &options.parms_in_bank1,"MCS51/DS390 - use Bank1 for parameter passing"}, - { 0, OPTION_STACK_SIZE, NULL,"MCS51/DS390 - Tells the linker to allocate this space for stack"}, - { 0, OPTION_PACK_IRAM, &options.pack_iram,"MCS51/DS390 - Tells the linker to pack variables in internal ram"}, #endif { 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_NO_PEEP_COMMENTS, &options.noPeepComments, "don't include peephole optimizer comments"}, - { 0, OPTION_PRINT_SEARCH_DIRS, &options.printSearchDirs, "display the directories in the compiler's search path"}, - { 0, OPTION_MSVC_ERROR_STYLE, &options.vc_err_style, "messages are compatible with Micro$oft visual studio"}, - { 0, OPTION_USE_STDOUT, &options.use_stdout, "send errors to stdout instead of stderr"}, #if !OPT_DISABLE_Z80 || !OPT_DISABLE_GBZ80 { 0, "--no-std-crt0", &options.no_std_crt0, "For the z80/gbz80 do not link default crt0.o"}, #endif + { 0, OPTION_SHORT_IS_8BITS, NULL, "Make short 8 bits (for old times sake)" }, + { 0, OPTION_CODE_SEG, NULL, " use this name for the code segment" }, + { 0, OPTION_CONST_SEG, NULL, " use this name for the const segment" }, + + { 0, NULL, NULL, "Optimization options"}, + { 0, "--nooverlay", &options.noOverlay, "Disable overlaying leaf function auto variables" }, + { 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, "Disable loop variable induction" }, + { 0, "--nojtbound", &optimize.noJTabBoundary, "Don't generate boundary check for jump tables" }, + { 0, "--noloopreverse", &optimize.noLoopReverse, "Disable the loop reverse optimisation" }, + { 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, "Enable peephole optimization on inline assembly" }, + { 0, OPTION_PEEP_FILE, NULL, " use this extra peephole file" }, + { 0, OPTION_OPT_CODE_SPEED, NULL, "Optimize for code speed rather than size" }, + { 0, OPTION_OPT_CODE_SIZE, NULL, "Optimize for code size rather than speed" }, + + { 0, NULL, NULL, "Internal debugging options"}, + { 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, "--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_ICODE_IN_ASM, &options.iCodeInAsm, "include i-code as comments in the asm file"}, + + { 0, NULL, NULL, "Linker options" }, + { 'l', NULL, NULL, "Include the given library in the link" }, + { 'L', NULL, NULL, "Add the next field to the library search path" }, + { 0, OPTION_LIB_PATH, NULL, " use this path to search for libraries" }, + { 0, OPTION_OUT_FMT_IHX, NULL, "Output in Intel hex format" }, + { 0, OPTION_OUT_FMT_S19, NULL, "Output in S19 hex format" }, + { 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 }, +#if !OPT_DISABLE_DS390 || !OPT_DISABLE_MCS51 + { 0, OPTION_STACK_SIZE, NULL,"MCS51/DS390 - Tells the linker to allocate this space for stack"}, + { 0, OPTION_PACK_IRAM, NULL,"MCS51/DS390 - Tells the linker to pack variables in internal ram (default)"}, + { 0, OPTION_NO_PACK_IRAM, &options.no_pack_iram,"MCS51/DS390 - Tells the linker not to pack variables in internal ram"}, +#endif + /* End of options */ { 0, NULL } }; @@ -345,7 +376,6 @@ static void _setProcessor (char *_processor) { port->processor = _processor; - fprintf(stderr,"Processor: %s\n",_processor); } static void @@ -382,7 +412,7 @@ _findPort (int argc, char **argv) } /* Use the first in the list */ - port = _ports[0]; + port = _ports[0]; } /* search through the command line options for the processor */ @@ -440,14 +470,25 @@ static void printOptions(const OPTION *optionsTable) { int i; - for (i = 0; optionsTable[i].shortOpt != 0 || optionsTable[i].longOpt != NULL; i++) + for (i = 0; + optionsTable[i].shortOpt != 0 || optionsTable[i].longOpt != NULL + || optionsTable[i].help != 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 : "" - ); + if (!optionsTable[i].shortOpt && !optionsTable[i].longOpt + && optionsTable[i].help) + { + fprintf (stdout, "\n%s:\n", optionsTable[i].help); + } + else + { + 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 : "" + ); + } } } @@ -488,12 +529,12 @@ setParseWithComma (set **dest, char *src) int length; /* skip the initial white spaces */ - while (isspace(*src)) + while (isspace((unsigned char)*src)) src++; /* skip the trailing white spaces */ length = strlen(src); - while (length && isspace(src[length-1])) + while (length && isspace((unsigned char)src[length-1])) src[--length] = '\0'; for (p = strtok(src, ","); p != NULL; p = strtok(NULL, ",")) @@ -507,10 +548,10 @@ static void setDefaultOptions (void) { /* 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 = 0; /* JCF: By default let the linker locate data */ + 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 = 0; /* JCF: By default let the linker locate data */ options.xdata_loc = 0; options.idata_loc = 0x80; options.nopeep = 0; @@ -519,6 +560,10 @@ setDefaultOptions (void) options.nostdinc = 0; options.verbose = 0; options.shortis8bits = 0; + options.std_sdcc = 1; /* enable SDCC language extensions */ + options.std_c99 = 0; /* default to C89 until more C99 support */ + options.code_seg = CODE_NAME; /* default to CSEG for generated code */ + options.const_seg = CONST_NAME; /* default to CONST for generated code */ options.stack10bit=0; @@ -614,7 +659,7 @@ processFile (char *s) moduleName = Safe_strdup ( fext ); for (fext = moduleName; *fext; fext++) - if (!isalnum (*fext)) + if (!isalnum ((unsigned char)*fext)) *fext = '_'; return; } @@ -739,7 +784,10 @@ 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++) + for (i = 0; + optionsTable[i].shortOpt != 0 || optionsTable[i].longOpt != NULL + || optionsTable[i].help != NULL; + i++) { if (optionsTable[i].shortOpt == shortOpt || (longOpt && optionsTable[i].longOpt && @@ -851,6 +899,12 @@ parseCmdLine (int argc, char **argv) continue; } + if (strcmp (argv[i], OPTION_OUT_FMT_S19) == 0) + { + options.out_fmt = 1; + continue; + } + if (strcmp (argv[i], OPTION_LARGE_MODEL) == 0) { _setModel (MODEL_LARGE, argv[i]); @@ -944,14 +998,14 @@ parseCmdLine (int argc, char **argv) if (strcmp (argv[i], OPTION_XRAM_SIZE) == 0) { - options.xram_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); + options.xram_size = getIntArg(OPTION_XRAM_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); + options.code_size = getIntArg(OPTION_CODE_SIZE, argv, &i, argc); continue; } @@ -997,6 +1051,20 @@ parseCmdLine (int argc, char **argv) continue; } + if (strcmp (argv[i], OPTION_OPT_CODE_SPEED) == 0) + { + optimize.codeSpeed = 1; + optimize.codeSize = 0; + continue; + } + + if (strcmp (argv[i], OPTION_OPT_CODE_SIZE) == 0) + { + optimize.codeSpeed = 0; + optimize.codeSize = 1; + continue; + } + if (strcmp (argv[i], OPTION_LESS_PEDANTIC) == 0) { options.lessPedantic = 1; @@ -1026,6 +1094,46 @@ parseCmdLine (int argc, char **argv) continue; } + if (strcmp (argv[i], OPTION_STD_C89) == 0) + { + options.std_c99 = 0; + options.std_sdcc = 0; + continue; + } + + if (strcmp (argv[i], OPTION_STD_C99) == 0) + { + options.std_c99 = 1; + options.std_sdcc = 0; + continue; + } + + if (strcmp (argv[i], OPTION_STD_SDCC89) == 0) + { + options.std_c99 = 0; + options.std_sdcc = 1; + continue; + } + + if (strcmp (argv[i], OPTION_STD_SDCC99) == 0) + { + options.std_c99 = 1; + options.std_sdcc = 1; + continue; + } + + if (strcmp (argv[i], OPTION_CODE_SEG) == 0) + { + options.code_seg = getStringArg(OPTION_CODE_SEG, argv, &i, argc); + continue; + } + + if (strcmp (argv[i], OPTION_CONST_SEG) == 0) + { + options.const_seg = getStringArg(OPTION_CONST_SEG, argv, &i, argc); + continue; + } + if (!port->parseOption (&argc, argv, &i)) { werror (W_UNKNOWN_OPTION, argv[i]); @@ -1190,7 +1298,10 @@ parseCmdLine (int argc, char **argv) SNPRINTF (buffer, sizeof(buffer), ((sOpt == 'I') ? "-%c\"%s\"": "-%c%s"), sOpt, rest); addSet(&preArgvSet, Safe_strdup(buffer)); - if(sOpt == 'I')addSet(&includeDirsSet, Safe_strdup(rest)); + if(sOpt == 'I') { + addSet(&includeDirsSet, Safe_strdup(rest)); + addSet(&userIncDirsSet, Safe_strdup(rest)); + } } break; @@ -1289,6 +1400,19 @@ parseCmdLine (int argc, char **argv) /* else no module given: help text is displayed */ } + /* set int, long and float reentrancy based on stack-auto */ + if (options.stackAuto) + { + options.intlong_rent++; + options.float_rent++; + } + + /* mcs51 has an assembly coded float library that's always reentrant */ + if (TARGET_IS_MCS51) + { + options.float_rent++; + } + /* set up external stack location if not explicitly specified */ if (!options.xstack_loc) options.xstack_loc = options.xdata_loc; @@ -1319,7 +1443,9 @@ linkEdit (char **envp) char *segName, *c; int system_ret; const char *s; + char linkerScriptFileName[PATH_MAX]; + linkerScriptFileName[0] = 0; if(port->linker.needLinkerScript) { @@ -1341,11 +1467,11 @@ linkEdit (char **envp) } /* first we need to create the .lnk file */ - SNPRINTF (scratchFileName, sizeof(scratchFileName), + SNPRINTF (linkerScriptFileName, sizeof(scratchFileName), "%s.lnk", dstFileName); - if (!(lnkfile = fopen (scratchFileName, "w"))) + if (!(lnkfile = fopen (linkerScriptFileName, "w"))) { - werror (E_FILE_OPEN_ERR, scratchFileName); + werror (E_FILE_OPEN_ERR, linkerScriptFileName); exit (1); } @@ -1357,7 +1483,7 @@ linkEdit (char **envp) else /*For all the other ports. Including pics???*/ { fprintf (lnkfile, "-myux%c\n", out_fmt); - if(options.pack_iram) + if(!options.no_pack_iram) fprintf (lnkfile, "-Y\n"); } @@ -1393,7 +1519,7 @@ linkEdit (char **envp) { /* code segment start */ - WRITE_SEG_LOC (CODE_NAME, options.code_loc); + WRITE_SEG_LOC (HOME_NAME, options.code_loc); /* data segment start. If zero, the linker chooses the best place for data */ @@ -1402,8 +1528,12 @@ linkEdit (char **envp) WRITE_SEG_LOC (DATA_NAME, options.data_loc); } - /* xdata start */ - WRITE_SEG_LOC (XDATA_NAME, options.xdata_loc); + /* xdata segment start. If zero, the linker chooses + the best place for xdata */ + if(options.xdata_loc) + { + WRITE_SEG_LOC (XDATA_NAME, options.xdata_loc); + } /* indirect data */ if (IDATA_NAME) @@ -1411,14 +1541,15 @@ linkEdit (char **envp) WRITE_SEG_LOC (IDATA_NAME, options.idata_loc); } - /* bit segment start */ - WRITE_SEG_LOC (BIT_NAME, 0); + /* bit segment start */ + WRITE_SEG_LOC (BIT_NAME, 0); - /* stack start */ - if ( (options.stack_loc) && (options.stack_loc<0x100) ) - { - WRITE_SEG_LOC ("SSEG", options.stack_loc); - } + /* stack start */ + if ( (options.stack_loc) && (options.stack_loc<0x100) && + !TARGET_IS_HC08) + { + WRITE_SEG_LOC ("SSEG", options.stack_loc); + } } else /*For the z80, gbz80*/ { @@ -1446,11 +1577,23 @@ linkEdit (char **envp) { switch (options.model) { - case MODEL_SMALL: - c = "small"; + case MODEL_SMALL: + if (options.stackAuto) + c = "small-stack-auto"; + else + c = "small"; + break; + case MODEL_MEDIUM: + if (options.stackAuto) + c = "medium-stack-auto"; + else + c = "medium"; break; case MODEL_LARGE: - c = "large"; + if (options.stackAuto) + c = "large-stack-auto"; + else + c = "large"; break; case MODEL_FLAT24: /* c = "flat24"; */ @@ -1558,14 +1701,20 @@ linkEdit (char **envp) It is very important for this file to be first on the linking proccess so the areas are set in the correct order, expecially _GSINIT*/ if ((TARGET_IS_Z80 || TARGET_IS_GBZ80) && - !options.no_std_crt0 && !options.nostdlib) /*For the z80, gbz80*/ + !options.no_std_crt0) /*For the z80, gbz80*/ { char crt0path[PATH_MAX]; FILE * crt0fp; - for (s = setFirstItem(libDirsSet); s != NULL; s = setNextItem(libDirsSet)) + set *tempSet=NULL; + + tempSet = appendStrSet(libDirsSet, NULL, DIR_SEPARATOR_STRING); + tempSet = appendStrSet(tempSet, NULL, c); + mergeSets(&tempSet, libPathsSet); + + for (s = setFirstItem(tempSet); s != NULL; s = setNextItem(tempSet)) { - sprintf (crt0path, "%s%s%s%scrt0.o", - s, DIR_SEPARATOR_STRING, c, DIR_SEPARATOR_STRING); + sprintf (crt0path, "%s%scrt0.o", + s, DIR_SEPARATOR_STRING); crt0fp=fopen(crt0path, "r"); if(crt0fp!=NULL)/*Found it!*/ @@ -1636,8 +1785,8 @@ linkEdit (char **envp) char buffer3[PATH_MAX]; set *tempSet=NULL, *libSet=NULL; - strcpy(buffer3, dstFileName); - if(TARGET_IS_PIC16) { + strcpy(buffer3, linkerScriptFileName); + if(/*TARGET_IS_PIC16 ||*/ TARGET_IS_PIC) { /* use $l to set the linker include directories */ tempSet = appendStrSet(libDirsSet, "-I\"", "\""); @@ -1814,6 +1963,16 @@ preProcess (char **envp) const char *s; set *inclList = NULL; + if (NULL != port->linker.rel_ext) + { +#define OBJ_EXT_STR "-obj-ext=" +#define OBJ_EXT_LEN ((sizeof OBJ_EXT_STR) - 1) + char *buf = Safe_alloc(strlen(port->linker.rel_ext) + (OBJ_EXT_LEN + 1)); + strcpy(buf, OBJ_EXT_STR); + strcpy(&buf[OBJ_EXT_LEN], port->linker.rel_ext); + addSet(&preArgvSet, buf); + } + /* if using external stack define the macro */ if (options.useXstack) addSet(&preArgvSet, Safe_strdup("-DSDCC_USE_XSTACK")); @@ -1884,7 +2043,6 @@ preProcess (char **envp) if (options.verbose) printf ("sdcc: Calling preprocessor...\n"); - buildCmdLine2 (buffer, sizeof(buffer), _preCmd); if (preProcOnly) { @@ -1931,13 +2089,6 @@ setBinPaths(const char *argv0) SNPRINTF(buf, sizeof buf, "%s" PREFIX2BIN_DIR, p); addSetHead(&binPathSet, Safe_strdup(buf)); } - -#if 0 - if (options.printSearchDirs) { - printf("programs:\n"); - fputStrSet(stdout, binPathSet); - } -#endif } /* Set system include path */ @@ -1945,27 +2096,42 @@ static void setIncludePath(void) { char *p; + char *p2=NULL; + set *tempSet=NULL; /* * 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) + * 1. - $SDCC_INCLUDE/target + * 2. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX/target + * 3. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX/target + * 4. - DATADIR/INCLUDE_DIR_SUFFIX/target (only on *nix) + * 5. - $SDCC_INCLUDE + * 6. - $SDCC_HOME/PREFIX2DATA_DIR/INCLUDE_DIR_SUFFIX + * 7. - path(argv[0])/BIN2DATA_DIR/INCLUDE_DIR_SUFFIX + * 8. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix) */ - includeDirsSet = appendStrSet(dataDirsSet, NULL, INCLUDE_DIR_SUFFIX); + if (options.nostdinc) + return; + + tempSet = appendStrSet(dataDirsSet, NULL, INCLUDE_DIR_SUFFIX); + includeDirsSet = appendStrSet(tempSet, NULL, DIR_SEPARATOR_STRING); + includeDirsSet = appendStrSet(includeDirsSet, NULL, port->target); + mergeSets(&includeDirsSet, tempSet); if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL) + { addSetHead(&includeDirsSet, p); - -#if 0 - if (options.printSearchDirs) { - printf("includedir:\n"); - fputStrSet(stdout, includeDirsSet); + p2=Safe_alloc(strlen(p)+strlen(DIR_SEPARATOR_STRING)+strlen(port->target)+1); + if(p2!=NULL) + { + strcpy(p2, p); + strcat(p2, DIR_SEPARATOR_STRING); + strcat(p2, port->target); + addSetHead(&includeDirsSet, p2); + } } -#endif } /* Set system lib path */ @@ -1983,17 +2149,13 @@ setLibPath(void) * 4. - DATADIR/LIB_DIR_SUFFIX/ (only on *nix) */ + if (options.nostdlib) + return; + libDirsSet = appendStrSet(dataDirsSet, NULL, LIB_DIR_SUFFIX); if ((p = getenv(SDCC_LIB_NAME)) != NULL) addSetHead(&libDirsSet, p); - -#if 0 - if (options.printSearchDirs) { - printf("libdir:\n"); - fputStrSet(stdout, libDirsSet); - } -#endif } /* Set data path */ @@ -2030,13 +2192,6 @@ setDataPaths(const char *argv0) addSet(&dataDirsSet, Safe_strdup(DATADIR)); #endif -#if 0 - if (options.printSearchDirs) { - printf("datadir:\n"); - fputStrSet(stdout, dataDirsSet); - } -#endif - setIncludePath(); setLibPath(); } @@ -2159,7 +2314,7 @@ main (int argc, char **argv, char **envp) #ifdef JAMIN_DS390 if (strcmp(port->target, "mcs51") == 0) { printf("DS390 jammed in A\n"); - _setPort ("ds390"); + _setPort ("ds390"); ds390_jammed = 1; } #endif @@ -2177,9 +2332,14 @@ main (int argc, char **argv, char **envp) options.stack10bit=0; } #endif + parseCmdLine (argc, argv); + if (options.verbose && NULL != port->processor) + printf("Processor: %s\n", port->processor); + initValues (); + setBinPaths(argv[0]); setDataPaths(argv[0]); @@ -2259,6 +2419,9 @@ main (int argc, char **argv, char **envp) !options.c1mode && (fullSrcFileName || peekSet(relFilesSet) != NULL)) { + if (options.verbose) + printf ("sdcc: Calling linker...\n"); + if (port->linker.do_link) port->linker.do_link (); else