X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=8b1194ba888fa19275225c1249df88a9d786ab50;hb=HEAD;hp=9d530c25a99b71922ec8c3b252e6362b110d2968;hpb=96ff6d16036e374f45b8aeb202e63a3578c8394a;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 9d530c25..8b1194ba 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -32,6 +32,7 @@ #include "common.h" #include #include "newalloc.h" +#include "dbuf_string.h" #include "SDCCerr.h" #include "BuildCmd.h" #include "MySystem.h" @@ -50,18 +51,21 @@ /* REMOVE ME!!! */ extern int yyparse (void); -FILE *srcFile; /* source file */ -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 */ +FILE *srcFile; /* source file */ +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 *moduleNameBase; /* module name base is source file without path and extension */ /* can be NULL while linking without compiling */ +char *moduleName; /* module name is same as module name base, but with all */ + /* 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; @@ -74,6 +78,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 @@ -83,84 +88,137 @@ set *libDirsSet = NULL; /* list of lib search directories */ int ds390_jammed = 0; #endif -/* Globally accessible scratch buffer for file names. */ +/* Globally accessible scratch buffer for file names. + TODO: replace them with local buffers */ char scratchFileName[PATH_MAX]; char buffer[PATH_MAX * 2]; -#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 LENGTH(_a) (sizeof(_a)/sizeof(*(_a))) + +#define OPTION_HELP "--help" +#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" +#define OPTION_DUMP_ALL "--dumpall" +#define OPTION_PEEP_FILE "--peep-file" +#define OPTION_LIB_PATH "--lib-path" +#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_IRAM_SIZE "--iram-size" +#define OPTION_XRAM_SIZE "--xram-size" +#define OPTION_CODE_SIZE "--code-size" +#define OPTION_VERSION "--version" #define OPTION_NO_LABEL_OPT "--nolabelopt" -#define OPTION_NO_LOOP_INV "--noinvariant" -#define OPTION_NO_LOOP_IND "--noinduction" -#define OPTION_LESS_PEDANTIC "--less-pedantic" -#define OPTION_NO_GCSE "--nogcse" -#define OPTION_SHORT_IS_8BITS "--short-is-8bits" -#define OPTION_TINI_LIBID "--tini-libid" +#define OPTION_NO_LOOP_INV "--noinvariant" +#define OPTION_NO_LOOP_IND "--noinduction" +#define OPTION_LESS_PEDANTIC "--less-pedantic" +#define OPTION_DISABLE_WARNING "--disable-warning" +#define OPTION_WERROR "--Werror" +#define OPTION_NO_GCSE "--nogcse" +#define OPTION_SHORT_IS_8BITS "--short-is-8bits" #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_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_USE_STDOUT "--use-stdout" +#define OPTION_NO_PEEP_COMMENTS "--no-peep-comments" +#define OPTION_VERBOSE_ASM "--fverbose-asm" +#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" +#define OPTION_DOLLARS_IN_IDENT "--fdollars-in-identifiers" +#define OPTION_UNSIGNED_CHAR "--funsigned-char" 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, OPTION_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" }, { 'A', NULL, NULL, NULL }, { '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, NULL, "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, OPTION_WERROR, NULL, "Treat the warnings as errors" }, + { 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, OPTION_DOLLARS_IN_IDENT, &options.dollars_in_ident, "Permit '$' as an identifier character" }, + { 0, OPTION_UNSIGNED_CHAR, &options.unsigned_char, "Make \"char\" unsigned by default" }, + + { 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, "--xstack", &options.useXstack, "Use external stack" }, + { 0, "--int-long-reent", &options.intlong_rent, "Use reentrant calls on the int and long support functions" }, + { 0, "--float-reent", &options.float_rent, "Use reentrant calls on the float support functions" }, + { 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, OPTION_CALLEE_SAVES, &options.calleeSavesSet, " Cause the called function to save registers insted of the caller", CLAT_SET }, + { 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" }, + { 0, "--stack-probe", &options.stack_probe,"insert call to function __stack_probe at each function prologue"}, + { 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_NO_PEEP_COMMENTS, &options.noPeepComments, "don't include peephole optimizer comments"}, + { 0, OPTION_VERBOSE_ASM, &options.verboseAsm, "include code generator comments"}, + { 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, NULL }, + { 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" }, - { '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, "--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, &options.peep_file, " use this extra peephole file", CLAT_STRING }, + { 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 }, @@ -170,67 +228,24 @@ optionsTable[] = { { 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_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" }, -#if !OPT_DISABLE_DS390 - { 0, "--use-accelerator", &options.useAccelerator,"generate code for DS390 Arithmetic Accelerator"}, -#endif - { 0, "--stack-probe", &options.stack_probe,"insert call to function __stack_probe at each function prologue"}, -#if !OPT_DISABLE_TININative - { 0, "--tini-libid", NULL," LibraryID used in -mTININative"}, -#endif -#if !OPT_DISABLE_DS390 - { 0, "--protect-sp-update", &options.protect_sp_update,"DS390 - will disable interrupts during ESP:SP updates"}, -#endif -#if !OPT_DISABLE_DS390 || !OPT_DISABLE_MCS51 - { 0, "--parms-in-bank1", &options.parms_in_bank1,"MCS51/DS390 - use Bank1 for parameter passing"}, -#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_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 -#if !OPT_DISABLE_PIC16 - { 0, "--gen-banksel", &options.gen_banksel, "enable the generation of banksel assembler directives in PIC16 port"}, -#endif + + { 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, &libPathsSet, " use this path to search for libraries", CLAT_ADD_SET }, + { 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, &options.xdata_loc, " External Ram start location", CLAT_INTEGER }, + { 0, OPTION_XRAM_SIZE, NULL, " External Ram size" }, + { 0, OPTION_IRAM_SIZE, &options.iram_size, " Internal Ram size", CLAT_INTEGER }, + { 0, OPTION_XSTACK_LOC, &options.xstack_loc, " External Stack start location", CLAT_INTEGER }, + { 0, OPTION_CODE_LOC, &options.code_loc, " Code Segment Location", CLAT_INTEGER }, + { 0, OPTION_CODE_SIZE, &options.code_size, " Code Segment size", CLAT_INTEGER }, + { 0, OPTION_STACK_LOC, &options.stack_loc, " Stack pointer initial value", CLAT_INTEGER }, + { 0, OPTION_DATA_LOC, &options.data_loc, " Direct data start location", CLAT_INTEGER }, + { 0, OPTION_IDATA_LOC, &options.idata_loc, NULL, CLAT_INTEGER }, + /* End of options */ { 0, NULL } }; @@ -248,14 +263,14 @@ typedef struct { const char *message; } UNSUPPORTEDOPT; -static const UNSUPPORTEDOPT +static const UNSUPPORTEDOPT unsupportedOptTable[] = { - { 'X', NULL, "use --xstack-loc instead" }, - { 'x', NULL, "use --xstack instead" }, - { 'i', NULL, "use --idata-loc instead" }, - { 'r', NULL, "use --xdata-loc instead" }, - { 's', NULL, "use --code-loc instead" }, - { 'Y', NULL, "use -I instead" } + { 'X', NULL, "use --xstack-loc instead" }, + { 'x', NULL, "use --xstack instead" }, + { 'i', NULL, "use --idata-loc instead" }, + { 'r', NULL, "use --xdata-loc instead" }, + { 's', NULL, "use --code-loc instead" }, + { 'Y', NULL, "use -I instead" } }; /** List of all default constant macros. @@ -268,7 +283,7 @@ static const char *_baseValues[] = { NULL }; -static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 -DSDCC=1 {cppextraopts} \"{fullsrcfilename}\" \"{cppoutfilename}\""; +static const char *_preCmd = "{cpp} -nostdinc -Wall {cppstd}{cppextraopts} \"{fullsrcfilename}\" \"{cppoutfilename}\""; PORT *port; @@ -289,12 +304,12 @@ static PORT *_ports[] = #if !OPT_DISABLE_DS390 &ds390_port, #endif -#if !OPT_DISABLE_PIC - &pic_port, -#endif #if !OPT_DISABLE_PIC16 &pic16_port, #endif +#if !OPT_DISABLE_PIC + &pic_port, +#endif #if !OPT_DISABLE_TININative &tininative_port, #endif @@ -302,7 +317,7 @@ static PORT *_ports[] = &xa51_port, #endif #if !OPT_DISABLE_DS400 - &ds400_port, + &ds400_port, #endif #if !OPT_DISABLE_HC08 &hc08_port, @@ -322,23 +337,22 @@ _setPort (const char *name) for (i = 0; i < NUM_PORTS; i++) { if (!strcmp (_ports[i]->target, name)) - { - port = _ports[i]; - return; - } + { + port = _ports[i]; + return; + } } /* Error - didnt find */ werror (E_UNKNOWN_TARGET, name); - exit (1); + exit (EXIT_FAILURE); } -/* Override the default processor with the one specified +/* 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 @@ -348,13 +362,13 @@ _validatePorts (void) for (i = 0; i < NUM_PORTS; i++) { 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"); - } + { + /* 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"); + } } } @@ -367,21 +381,15 @@ _findPort (int argc, char **argv) while (argc--) { if (!strncmp (*argv, "-m", 2)) - { - _setPort (*argv + 2); - return; - } + { + _setPort (*argv + 2); + return; + } argv++; } /* Use the first in the list */ -#if defined(DEFAULT_PORT) - /* VR - 13/5/2003 DEFAULT_PORT is defined in port.h */ - port = &DEFAULT_PORT; -#else - port = _ports[0]; -#endif - + port = _ports[0]; } /* search through the command line options for the processor */ @@ -391,10 +399,10 @@ _findProcessor (int argc, char **argv) while (argc--) { if (!strncmp (*argv, "-p", 2)) - { - _setProcessor (*argv + 2); - return; - } + { + _setProcessor (*argv + 2); + return; + } argv++; } @@ -405,102 +413,110 @@ _findProcessor (int argc, char **argv) /* printVersionInfo - prints the version info */ /*-----------------------------------------------------------------*/ void -printVersionInfo (void) +printVersionInfo (FILE *stream) { int i; - fprintf (stderr, - "SDCC : "); - for (i = 0; i < NUM_PORTS; i++) { - fprintf (stderr, "%s%s", i == 0 ? "" : "/", _ports[i]->target); -#ifdef DEFAULT_PORT - fprintf(stderr, "%s", (&DEFAULT_PORT == _ports[i])?"*":""); -#endif - } - - fprintf (stderr, " " SDCC_VERSION_STR + fprintf (stream, + "SDCC : "); + for (i = 0; i < NUM_PORTS; i++) + fprintf (stream, "%s%s", i == 0 ? "" : "/", _ports[i]->target); + + fprintf (stream, " " SDCC_VERSION_STR #ifdef SDCC_SUB_VERSION_STR - "/" SDCC_SUB_VERSION_STR + "/" SDCC_SUB_VERSION_STR #endif - " (" __DATE__ ")" -#ifdef __CYGWIN__ - " (CYGWIN)\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 - ); + " #%s (%s) (%s)\n", + getBuildNumber(), getBuildDate(), getBuildEnvironment() ); } static void -printOptions(const OPTION *optionsTable) +printOptions(const OPTION *optionsTable, FILE *stream) { 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 (stream, "\n%s:\n", optionsTable[i].help); + } + else + { + fprintf(stream, " %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 */ /*-----------------------------------------------------------------*/ -void +static void printUsage (void) { int i; - printVersionInfo(); - fprintf (stdout, + FILE *stream = stderr; + + printVersionInfo (stream); + fprintf (stream, "Usage : sdcc [options] filename\n" "Options :-\n" ); - printOptions(optionsTable); + printOptions (optionsTable, stream); 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); - } + if (_ports[i]->poptions != NULL) + { + fprintf (stream, "\nSpecial options for the %s port:\n", _ports[i]->target); + printOptions (_ports[i]->poptions, stream); + } } - - exit (0); } /*-----------------------------------------------------------------*/ /* setParseWithComma - separates string with comma to a set */ /*-----------------------------------------------------------------*/ void -setParseWithComma (set **dest, char *src) +setParseWithComma (set **dest, const char *src) { - char *p; - int length; + const char *p, *end; + struct dbuf_s dbuf; /* skip the initial white spaces */ - while (isspace(*src)) - src++; - + while (isspace((unsigned char)*src)) + ++src; + /* skip the trailing white spaces */ - length = strlen(src); - while (length && isspace(src[length-1])) - src[--length] = '\0'; + end = &src[strlen(src) - 1]; + while (end >= src && isspace((unsigned char)*end)) + --end; + ++end; + + p = src; + while (src < end) + { + dbuf_init (&dbuf, 16); + + while (p < end && ',' != *p) + ++p; + dbuf_append (&dbuf, src, p - src); + + /* null terminate the buffer */ + dbuf_c_str (&dbuf); + addSet(dest, dbuf_detach (&dbuf)); - for (p = strtok(src, ","); p != NULL; p = strtok(NULL, ",")) - addSet(dest, Safe_strdup(p)); + src = ++p; + } } /*-----------------------------------------------------------------*/ @@ -510,18 +526,22 @@ 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.idata_loc = 0; /* MB: No need to limit idata to 0x80-0xFF */ options.nopeep = 0; options.model = port->general.default_model; options.nostdlib = 0; 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 ? Safe_strdup(CODE_NAME) : NULL; /* default to CSEG for generated code */ + options.const_seg = CONST_NAME ? Safe_strdup(CONST_NAME) : NULL; /* default to CONST for generated code */ options.stack10bit=0; @@ -545,97 +565,98 @@ setDefaultOptions (void) static void processFile (char *s) { - char *fext = NULL; + const char *extp; + struct dbuf_s ext; + struct dbuf_s path; - /* get the file extension */ - fext = s + strlen (s); - while ((fext != s) && *fext != '.') - fext--; + dbuf_init (&ext, 128); + dbuf_init (&path, 128); - /* now if no '.' then we don't know what the file type is + /* get the file extension. + If no '.' then we don't know what the file type is so give a warning and return */ - if (fext == s) + if (!dbuf_splitFile (s, &path, &ext)) { werror (W_UNKNOWN_FEXT, s); + + dbuf_destroy (&ext); + dbuf_destroy (&path); + return; } /* otherwise depending on the file type */ - if (strcmp (fext, ".c") == 0 || strcmp (fext, ".C") == 0) + extp = dbuf_c_str (&ext); + if (STRCASECMP (extp, ".c") == 0) { + char *p; + + dbuf_destroy (&ext); + /* source file name : not if we already have a source file */ if (fullSrcFileName) - { - werror (W_TOO_MANY_SRC, s); - return; - } + { + werror (W_TOO_MANY_SRC, s); + + dbuf_destroy (&path); + + return; + } /* the only source file */ fullSrcFileName = s; if (!(srcFile = fopen (fullSrcFileName, "r"))) - { - werror (E_FILE_OPEN_ERR, s); - exit (1); - } - - /* copy the file name into the buffer */ - strncpyz (buffer, s, sizeof(buffer)); + { + werror (E_FILE_OPEN_ERR, s); - /* get rid of the "."-extension */ + dbuf_destroy (&path); - /* 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'; + exit (EXIT_FAILURE); } /* get rid of any path information 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) != DIR_SEPARATOR_CHAR && - *(fext - 1) != ':') - { - 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 ); + dbuf_init (&ext, 128); + + dbuf_splitPath (dbuf_c_str (&path), NULL, &ext); + dbuf_destroy (&path); + + moduleNameBase = Safe_strdup (dbuf_c_str (&ext)); + moduleName = dbuf_detach (&ext); + + for (p = moduleName; *p; ++p) + if (!isalnum ((unsigned char)*p)) + *p = '_'; return; } /* if the extention is type .rel or .r or .REL or .R - addtional object file will be passed to the linker */ - if (strcmp (fext, ".r") == 0 || strcmp (fext, ".rel") == 0 || - strcmp (fext, ".R") == 0 || strcmp (fext, ".REL") == 0 || - strcmp (fext, port->linker.rel_ext) == 0) + additional object file will be passed to the linker */ + if (STRCASECMP (extp, ".r") == 0 || STRCASECMP (extp, ".rel") == 0 || + strcmp (extp, port->linker.rel_ext) == 0) { - addSet(&relFilesSet, Safe_strdup(s)); + dbuf_destroy (&ext); + dbuf_destroy (&path); + + addSet (&relFilesSet, Safe_strdup (s)); return; } /* if .lib or .LIB */ - if (strcmp (fext, ".lib") == 0 || strcmp (fext, ".LIB") == 0) + if (STRCASECMP (extp, ".lib") == 0) { - addSet(&libFilesSet, Safe_strdup(s)); + dbuf_destroy (&ext); + dbuf_destroy (&path); + + addSet (&libFilesSet, Safe_strdup (s)); return; } - werror (W_UNKNOWN_FEXT, s); + dbuf_destroy (&ext); + dbuf_destroy (&path); + werror (W_UNKNOWN_FEXT, s); } static void @@ -650,7 +671,7 @@ _setModel (int model, const char *sz) /** Gets the string argument to this option. If the option is '--opt' then for input of '--optxyz' or '--opt xyz' returns xyz. */ -static char * +char * getStringArg(const char *szStart, char **argv, int *pi, int argc) { if (argv[*pi][strlen(szStart)]) @@ -664,7 +685,7 @@ getStringArg(const char *szStart, char **argv, int *pi, int argc) { werror (E_ARGUMENT_MISSING, szStart); /* Die here rather than checking for errors later. */ - exit(-1); + exit (EXIT_FAILURE); } else { @@ -676,10 +697,21 @@ getStringArg(const char *szStart, char **argv, int *pi, int argc) /** Gets the integer argument to this option using the same rules as getStringArg. */ -static int +int getIntArg(const char *szStart, char **argv, int *pi, int argc) { - return (int)floatFromVal(constVal(getStringArg(szStart, argv, pi, argc))); + char *p; + int val; + char *str = getStringArg(szStart, argv, pi, argc); + + val = strtol(str, &p, 0); + if (p == str || *p != '\0') + { + werror (E_BAD_INT_ARGUMENT, szStart); + /* Die here rather than checking for errors later. */ + exit (EXIT_FAILURE); + } + return val; } static void @@ -694,114 +726,158 @@ verifyShortOption(const char *opt) static bool tryHandleUnsupportedOpt(char **argv, int *pi) { - if (argv[*pi][0] == '-') - { - const char *longOpt = ""; - char shortOpt = -1; - int i; + 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]; - SNPRINTF(buffer, sizeof(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; + if (argv[*pi][1] == '-') + { + /* Long option. */ + longOpt = argv[*pi]; } - else + else + { + shortOpt = argv[*pi][1]; + } + for (i = 0; i < LENGTH(unsupportedOptTable); i++) { - /* Not an option, so can't be unsupported :) */ - return 0; + if (unsupportedOptTable[i].shortOpt == shortOpt || + (longOpt && unsupportedOptTable[i].longOpt && !strcmp(unsupportedOptTable[i].longOpt, longOpt))) + { + /* Found an unsupported opt. */ + char buffer[100]; + SNPRINTF(buffer, sizeof(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 -scanOptionsTable(const OPTION *optionsTable, char shortOpt, const char *longOpt, char **argv, int *pi) +scanOptionsTable(const OPTION *optionsTable, char shortOpt, const char *longOpt, char **argv, int *pi, int argc) { 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 && - 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 (optionsTable[i].shortOpt == shortOpt) + { + if (optionsTable[i].pparameter != NULL) + { + verifyShortOption(argv[*pi]); -static bool -tryHandleSimpleOpt(char **argv, int *pi) -{ - if (argv[*pi][0] == '-') + (*(int *)optionsTable[i].pparameter)++; + + return TRUE; + } + } + else { - const char *longOpt = ""; - char shortOpt = -1; + size_t len = optionsTable[i].longOpt ? strlen (optionsTable[i].longOpt) : 0; - if (argv[*pi][1] == '-') + if (longOpt && + (optionsTable[i].arg_type != CLAT_BOOLEAN || + (optionsTable[i].arg_type == CLAT_BOOLEAN && len == strlen (longOpt) && optionsTable[i].longOpt)) && + strncmp (optionsTable[i].longOpt, longOpt, len) == 0) + { + /* If it is a flag then we can handle it here */ + if (optionsTable[i].pparameter != NULL) { - /* Long option. */ - longOpt = argv[*pi]; + switch (optionsTable[i].arg_type) + { + case CLAT_BOOLEAN: + (*(int *)optionsTable[i].pparameter)++; + break; + + case CLAT_INTEGER: + *(int *)optionsTable[i].pparameter = getIntArg (optionsTable[i].longOpt, argv, pi, argc); + break; + + case CLAT_STRING: + if (*(char **)optionsTable[i].pparameter) + Safe_free(*(char **)optionsTable[i].pparameter); + *(char **)optionsTable[i].pparameter = Safe_strdup (getStringArg (optionsTable[i].longOpt, argv, pi, argc)); + break; + + case CLAT_SET: + if (*(set **)optionsTable[i].pparameter) + { + deleteSet ((set **)optionsTable[i].pparameter); + } + setParseWithComma ((set **)optionsTable[i].pparameter, getStringArg (optionsTable[i].longOpt, argv, pi, argc)); + break; + + case CLAT_ADD_SET: + addSet((set **)optionsTable[i].pparameter, Safe_strdup (getStringArg (optionsTable[i].longOpt, argv, pi, argc))); + break; + } + return TRUE; } - else + else { - shortOpt = argv[*pi][1]; + /* Not a flag. Handled manually later. */ + return FALSE; } + } + } + } + /* Didn't find in the table */ + return FALSE; +} + +static bool +tryHandleSimpleOpt(char **argv, int *pi, int argc) +{ + if (argv[*pi][0] == '-') + { + const char *longOpt = ""; + char shortOpt = -1; - 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; - } + if (argv[*pi][1] == '-') + { + /* Long option. */ + longOpt = argv[*pi]; + } + else + { + shortOpt = argv[*pi][1]; + } + + if (scanOptionsTable(optionsTable, shortOpt, longOpt, argv, pi, argc)) + { + return TRUE; + } + else if (port && port->poptions && + scanOptionsTable(port->poptions, shortOpt, longOpt, argv, pi, argc)) + { + return TRUE; } - else + else { - /* Not an option, so can't be handled. */ - return 0; + return FALSE; } + } + else + { + /* Not an option, so can't be handled. */ + return FALSE; + } } /*-----------------------------------------------------------------*/ @@ -816,297 +892,308 @@ parseCmdLine (int argc, char **argv) for (i = 1; i < argc; i++) { if (i >= argc) - break; + break; - if (tryHandleUnsupportedOpt(argv, &i) == TRUE) - { - continue; - } + /* check port specific options before general ones */ + if (port->parseOption (&argc, argv, &i) == TRUE) + { + continue; + } - if (tryHandleSimpleOpt(argv, &i) == TRUE) - { - continue; - } + if (tryHandleUnsupportedOpt(argv, &i) == TRUE) + { + continue; + } + + if (tryHandleSimpleOpt(argv, &i, argc) == TRUE) + { + continue; + } /* options */ if (argv[i][0] == '-' && argv[i][1] == '-') - { - if (strcmp (argv[i], OPTION_HELP) == 0) - { - printUsage (); - exit (0); - } - - if (strcmp (argv[i], OPTION_STACK_8BIT) == 0) - { - options.stack10bit = 0; - continue; - } - - if (strcmp (argv[i], OPTION_OUT_FMT_IHX) == 0) - { - options.out_fmt = 0; - continue; - } - - if (strcmp (argv[i], OPTION_LARGE_MODEL) == 0) - { - _setModel (MODEL_LARGE, argv[i]); - continue; - } - - if (strcmp (argv[i], OPTION_MEDIUM_MODEL) == 0) - { - _setModel (MODEL_MEDIUM, argv[i]); - continue; - } - - if (strcmp (argv[i], OPTION_SMALL_MODEL) == 0) - { - _setModel (MODEL_SMALL, argv[i]); - continue; - } - - if (strcmp (argv[i], OPTION_FLAT24_MODEL) == 0) - { - _setModel (MODEL_FLAT24, argv[i]); - continue; - } - - if (strcmp (argv[i], OPTION_DUMP_ALL) == 0) - { - options.dump_rassgn = - options.dump_pack = - options.dump_range = - options.dump_kill = - options.dump_loop = - options.dump_gcse = - options.dump_raw = 1; - continue; - } - - if (strcmp (argv[i], OPTION_PEEP_FILE) == 0) - { - options.peep_file = getStringArg(OPTION_PEEP_FILE, argv, &i, argc); - continue; - } - - if (strcmp (argv[i], OPTION_LIB_PATH) == 0) + { + if (strcmp (argv[i], OPTION_USE_STDOUT) == 0) + { + if (options.use_stdout == 0) + { + options.use_stdout = 1; + dup2(STDOUT_FILENO, STDERR_FILENO); + } + continue; + } + if (strcmp (argv[i], OPTION_HELP) == 0) + { + printUsage (); + exit (EXIT_SUCCESS); + } + + if (strcmp (argv[i], OPTION_OUT_FMT_IHX) == 0) + { + options.out_fmt = 0; + 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]); + continue; + } + + if (strcmp (argv[i], OPTION_MEDIUM_MODEL) == 0) + { + _setModel (MODEL_MEDIUM, argv[i]); + continue; + } + + if (strcmp (argv[i], OPTION_SMALL_MODEL) == 0) { - addSet(&libPathsSet, Safe_strdup(getStringArg(OPTION_LIB_PATH, argv, &i, argc))); - continue; - } - - if (strcmp (argv[i], OPTION_VERSION) == 0) - { - printVersionInfo (); - exit (0); - continue; - } - - if (strcmp (argv[i], OPTION_CALLEE_SAVES) == 0) - { - setParseWithComma(&options.calleeSavesSet, getStringArg(OPTION_CALLEE_SAVES, argv, &i, argc)); - continue; - } - - if (strcmp (argv[i], OPTION_XSTACK_LOC) == 0) - { - options.xstack_loc = getIntArg(OPTION_XSTACK_LOC, argv, &i, argc); - continue; - } - - if (strcmp (argv[i], OPTION_STACK_LOC) == 0) - { - options.stack_loc = getIntArg(OPTION_STACK_LOC, argv, &i, argc); - continue; - } - - if (strcmp (argv[i], OPTION_XRAM_LOC) == 0) - { - options.xdata_loc = getIntArg(OPTION_XRAM_LOC, argv, &i, argc); - continue; - } - - if (strcmp (argv[i], OPTION_IRAM_SIZE) == 0) - { - options.iram_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); - 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); - continue; - } - - if (strcmp (argv[i], OPTION_IDATA_LOC) == 0) - { - options.idata_loc = getIntArg(OPTION_IDATA_LOC, argv, &i, argc); - continue; - } - - if (strcmp (argv[i], OPTION_CODE_LOC) == 0) - { - options.code_loc = getIntArg(OPTION_CODE_LOC, argv, &i, argc); - continue; - } - - if (strcmp (argv[i], OPTION_NO_GCSE) == 0) - { - optimize.global_cse = 0; - continue; - } - - if (strcmp (argv[i], OPTION_NO_LOOP_INV) == 0) - { - optimize.loopInvariant = 0; - 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; - continue; - } - - if (strcmp (argv[i], OPTION_LESS_PEDANTIC) == 0) + _setModel (MODEL_SMALL, argv[i]); + continue; + } + + if (strcmp (argv[i], OPTION_DUMP_ALL) == 0) + { + options.dump_rassgn = + options.dump_pack = + options.dump_range = + options.dump_kill = + options.dump_loop = + options.dump_gcse = + options.dump_raw = 1; + continue; + } + + if (strcmp (argv[i], OPTION_VERSION) == 0) + { + printVersionInfo (stdout); + exit (EXIT_SUCCESS); + continue; + } + + if (strcmp (argv[i], OPTION_XRAM_SIZE) == 0) { - options.lessPedantic = 1; + options.xram_size = getIntArg(OPTION_XRAM_SIZE, argv, &i, argc); + options.xram_size_set = TRUE; + continue; + } + + if (strcmp (argv[i], OPTION_NO_GCSE) == 0) + { + optimize.global_cse = 0; + continue; + } + + if (strcmp (argv[i], OPTION_NO_LOOP_INV) == 0) + { + optimize.loopInvariant = 0; + 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; + 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; setErrorLogLevel(ERROR_LEVEL_WARNING); continue; } - if (strcmp (&argv[i][1], OPTION_SHORT_IS_8BITS) == 0) + if (strcmp (argv[i], OPTION_DISABLE_WARNING) == 0) + { + int w = getIntArg(OPTION_DISABLE_WARNING, argv, &i, argc); + if (w < MAX_ERROR_WARNING) + { + setWarningDisabled(w); + } + continue; + } + + if (strcmp (argv[i], OPTION_WERROR) == 0) + { + setWError(1); + addSet(&preArgvSet, Safe_strdup("-Werror")); + continue; + } + + if (strcmp (&argv[i][1], OPTION_SHORT_IS_8BITS) == 0) { 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)) - { - werror (W_UNKNOWN_OPTION, argv[i]); - } - else - { - 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) + { + struct dbuf_s segname; + + dbuf_init (&segname, 16); + dbuf_printf (&segname, "%-8s(CODE)", getStringArg (OPTION_CODE_SEG, argv, &i, argc)); + if (options.code_seg) Safe_free(options.code_seg); + options.code_seg = dbuf_detach (&segname); + continue; + } + + if (strcmp (argv[i], OPTION_CONST_SEG) == 0) + { + struct dbuf_s segname; + + dbuf_init (&segname, 16); + dbuf_printf (&segname, "%-8s(CODE)", getStringArg (OPTION_CONST_SEG, argv, &i, argc)); + if (options.const_seg) Safe_free(options.const_seg); + options.const_seg = dbuf_detach (&segname); + continue; + } + + werror (W_UNKNOWN_OPTION, argv[i]); + continue; + } /* if preceded by '-' then option */ if (*argv[i] == '-') - { - switch (argv[i][1]) - { - case 'h': + { + switch (argv[i][1]) + { + case 'h': verifyShortOption(argv[i]); - printUsage (); - exit (0); - break; + printUsage (); + exit (EXIT_SUCCESS); + break; - case 'm': - /* Used to select the port. But this has already been done. */ - break; + case 'm': + /* 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 'p': + /* Used to select the processor in port. But this has + * already been done. */ + break; - case 'c': + case 'c': verifyShortOption(argv[i]); - options.cc_only = 1; - break; + options.cc_only = 1; + break; - case 'L': + case 'L': addSet(&libPathsSet, Safe_strdup(getStringArg("-L", argv, &i, argc))); break; case 'l': addSet(&libFilesSet, Safe_strdup(getStringArg("-l", argv, &i, argc))); break; - + case 'o': { - char *p; + char *outName = getStringArg("-o", argv, &i, argc); + size_t len = strlen(outName); - /* 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) + if (IS_DIR_SEPARATOR(outName[len - 1])) { /* only output path specified */ - dstPath = Safe_strdup (buffer); + dstPath = Safe_malloc(len); + memcpy(dstPath, outName, len - 1); + dstPath[len - 1] = '\0'; fullDstFileName = NULL; } else { - fullDstFileName = Safe_strdup (buffer); + struct dbuf_s path; - /* get rid of the "."-extension */ + dbuf_init (&path, 128); + fullDstFileName = Safe_strdup (outName); - /* 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 the "."-extension */ + dbuf_splitFile (outName, &path, NULL); - dstFileName = Safe_strdup (buffer); + dbuf_c_str (&path); + dstFileName = dbuf_detach (&path); + dbuf_init (&path, 128); /* strip module name to get path */ - p = strrchr (buffer, DIR_SEPARATOR_CHAR); - if (p) + if (dbuf_splitPath (dstFileName, &path, NULL)) { - /* path with trailing / */ - p[1] = '\0'; - dstPath = Safe_strdup (buffer); + dbuf_c_str (&path); + dstPath = dbuf_detach (&path); } + else + dbuf_destroy (&path); } break; } - case 'W': + case 'W': /* pre-processer options */ if (argv[i][2] == 'p') { setParseWithComma(&preArgvSet, getStringArg("-Wp", argv, &i, argc)); } - /* linker options */ - else if (argv[i][2] == 'l') - { + /* linker options */ + else if (argv[i][2] == 'l') + { setParseWithComma(&linkOptionsSet, getStringArg("-Wl", argv, &i, argc)); - } + } /* assembler options */ - else if (argv[i][2] == 'a') + else if (argv[i][2] == 'a') { setParseWithComma(&asmOptionsSet, getStringArg("-Wa", argv, &i, argc)); } @@ -1114,82 +1201,80 @@ parseCmdLine (int argc, char **argv) { werror (W_UNKNOWN_OPTION, argv[i]); } - break; + break; - case 'v': + case 'v': verifyShortOption(argv[i]); - printVersionInfo (); - exit (0); - break; - - /* preprocessor options */ - case 'M': - { - preProcOnly = 1; - addSet(&preArgvSet, Safe_strdup("-M")); - break; - } - case 'C': - { - addSet(&preArgvSet, Safe_strdup("-C")); - break; - } - - case 'd': - case 'D': - case 'I': - case 'A': - case 'U': - { - char sOpt = argv[i][1]; - char *rest; - - if (argv[i][2] == ' ' || argv[i][2] == '\0') - { - i++; + printVersionInfo (stdout); + exit (EXIT_SUCCESS); + break; + + /* preprocessor options */ + case 'M': + { + preProcOnly = 1; + if (argv[i][2] == 'M') + addSet(&preArgvSet, Safe_strdup("-MM")); + else + addSet(&preArgvSet, Safe_strdup("-M")); + break; + } + + case 'd': + case 'D': + case 'I': + case 'A': + case 'U': + { + char sOpt = argv[i][1]; + char *rest; + + if (argv[i][2] == ' ' || argv[i][2] == '\0') + { + i++; if (i >= argc) { - /* No argument. */ - werror(E_ARGUMENT_MISSING, argv[i-1]); - break; + /* No argument. */ + werror(E_ARGUMENT_MISSING, argv[i-1]); + break; } else { - rest = argv[i]; + rest = argv[i]; } - } - else - rest = &argv[i][2]; + } + else + rest = &argv[i][2]; - if (sOpt == 'Y') - sOpt = 'I'; + if (sOpt == 'Y') + sOpt = 'I'; SNPRINTF (buffer, sizeof(buffer), ((sOpt == 'I') ? "-%c\"%s\"": "-%c%s"), sOpt, rest); - addSet(&preArgvSet, Safe_strdup(buffer)); - } - break; - - default: - if (!port->parseOption (&argc, argv, &i)) - werror (W_UNKNOWN_OPTION, argv[i]); - } - continue; - } - - if (!port->parseOption (&argc, argv, &i)) - { - /* no option must be a filename */ - if (options.c1mode) - { - werror (W_NO_FILE_ARG_IN_C1, argv[i]); - } - else - { - processFile (argv[i]); - } - } + addSet(&preArgvSet, Safe_strdup(buffer)); + if(sOpt == 'I') { + addSet(&includeDirsSet, Safe_strdup(rest)); + addSet(&userIncDirsSet, Safe_strdup(rest)); + } + } + break; + + default: + werror (W_UNKNOWN_OPTION, argv[i]); + } + continue; + } + + /* 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 */ @@ -1198,32 +1283,41 @@ parseCmdLine (int argc, char **argv) const char *s; if (fullSrcFileName) - { - fclose (srcFile); - werror (W_NO_FILE_ARG_IN_C1, fullSrcFileName); - } + { + fclose (srcFile); + werror (W_NO_FILE_ARG_IN_C1, fullSrcFileName); + } fullSrcFileName = NULL; for (s = setFirstItem(relFilesSet); s != NULL; s = setNextItem(relFilesSet)) - { - werror (W_NO_FILE_ARG_IN_C1, s); - } + { + werror (W_NO_FILE_ARG_IN_C1, s); + } for (s = setFirstItem(libFilesSet); s != NULL; s = setNextItem(libFilesSet)) - { - werror (W_NO_FILE_ARG_IN_C1, s); - } + { + werror (W_NO_FILE_ARG_IN_C1, s); + } deleteSet(&relFilesSet); deleteSet(&libFilesSet); - if (options.cc_only || noAssemble || preProcOnly) - { - werror (W_ILLEGAL_OPT_COMBINATION); - } + 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); - } + { + werror (E_NEED_OPT_O_IN_C1); + exit (EXIT_FAILURE); + } + else + { + char *p; + + moduleName = Safe_strdup(dstFileName); + for (p = moduleName; *p; ++p) + if (!isalnum ((unsigned char)*p)) + *p = '_'; + } } /* if no dstFileName given with -o, we've to find one: */ if (!dstFileName) @@ -1233,59 +1327,97 @@ parseCmdLine (int argc, char **argv) /* use the modulename from the C-source */ if (fullSrcFileName) { - size_t bufSize = strlen (dstPath) + strlen (moduleName) + 1; + struct dbuf_s path; - dstFileName = Safe_alloc (bufSize); - strncpyz (dstFileName, dstPath, bufSize); - strncatz (dstFileName, moduleName, bufSize); + if (*dstPath != '\0') + { + dbuf_init(&path, 128); + dbuf_makePath (&path, dstPath, moduleNameBase); + dbuf_c_str (&path); + dstFileName = dbuf_detach (&path); + } + else + dstFileName = Safe_strdup(moduleNameBase); } /* use the modulename from the first object file */ else if ((s = peekSet(relFilesSet)) != NULL) { - char *objectName; - size_t bufSize; - - strncpyz (buffer, s, sizeof(buffer)); - /* remove extension (it must be .rel) */ - *strrchr (buffer, '.') = '\0'; - /* remove path */ - objectName = strrchr (buffer, DIR_SEPARATOR_CHAR); - if (objectName) + struct dbuf_s file; + + dbuf_init(&file, 128); + + /* get rid of the "."-extension */ + dbuf_splitFile (s, &file, NULL); + + dbuf_c_str (&file); + s = dbuf_detach (&file); + + dbuf_init (&file, 128); + + dbuf_splitPath (s, NULL, &file); + + if (*dstPath != '\0') { - ++objectName; + struct dbuf_s path; + + dbuf_init(&path, 128); + dbuf_makePath (&path, dstPath, dbuf_c_str (&file)); + dbuf_destroy (&file); + dbuf_c_str (&path); + dstFileName = dbuf_detach (&path); } else { - objectName = buffer; + dbuf_c_str (&file); + dstFileName = dbuf_detach (&file); } - 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; + /* 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; + } /* if debug option is set then open the cdbFile */ if (options.debug && fullSrcFileName) { SNPRINTF (scratchFileName, sizeof(scratchFileName), - "%s.adb", dstFileName); /*JCF: Nov 30, 2002*/ + "%s.adb", dstFileName); /*JCF: Nov 30, 2002*/ if(debugFile->openFile(scratchFileName)) - debugFile->writeModule(moduleName); + debugFile->writeModule(moduleName); else - werror (E_FILE_OPEN_ERR, scratchFileName); + werror (E_FILE_OPEN_ERR, scratchFileName); } MSVC_style(options.vc_err_style); - if(options.use_stdout) dup2(STDOUT_FILENO, STDERR_FILENO); return 0; } +/*-----------------------------------------------------------------*/ +/* finalizeOptions - finalize (post-process( options */ +/*-----------------------------------------------------------------*/ +static void +finalizeOptions (void) +{ + /* no peephole comments if not verbose asm */ + if (!options.verboseAsm) + options.noPeepComments = 1; +} + /*-----------------------------------------------------------------*/ /* linkEdit : - calls the linkage editor with options */ /*-----------------------------------------------------------------*/ @@ -1296,248 +1428,318 @@ linkEdit (char **envp) char *segName, *c; int system_ret; const char *s; + char linkerScriptFileName[PATH_MAX]; - /* first we need to create the .lnk file */ - SNPRINTF (scratchFileName, sizeof(scratchFileName), - "%s.lnk", dstFileName); - if (!(lnkfile = fopen (scratchFileName, "w"))) + linkerScriptFileName[0] = 0; + c = NULL; + + if (port->linker.needLinkerScript) { - werror (E_FILE_OPEN_ERR, scratchFileName); - exit (1); - } + char out_fmt; + + switch (options.out_fmt) + { + case 0: + out_fmt = 'i'; /* Intel hex */ + break; + case 1: + out_fmt = 's'; /* Motorola S19 */ + break; + case 2: + out_fmt = 't'; /* Elf */ + break; + default: + out_fmt = 'i'; + } + + /* first we need to create the .lnk file */ + SNPRINTF (linkerScriptFileName, sizeof(linkerScriptFileName), + "%s.lnk", dstFileName); + if (!(lnkfile = fopen (linkerScriptFileName, "w"))) + { + werror (E_FILE_OPEN_ERR, linkerScriptFileName); + exit (EXIT_FAILURE); + } - if (TARGET_IS_Z80 || TARGET_IS_GBZ80) - { - fprintf (lnkfile, "--\n-m\n-j\n-x\n-%c %s\n", - (options.out_fmt ? 's' : 'i'), dstFileName); - } - else /*For all the other ports. Including pics???*/ - { - fprintf (lnkfile, "-myux%c\n", (options.out_fmt ? 's' : 'i')); - } - - if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80)) /*Not for the z80, gbz80*/ - { - /* 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"); - } + if (TARGET_Z80_LIKE) + { + fprintf (lnkfile, "--\n-m\n-j\n-x\n-%c %s\n", + out_fmt, dstFileName); + } + else /*For all the other ports. Including pics???*/ + { + fprintf (lnkfile, "-myux%c\n", out_fmt); + if(!options.no_pack_iram) + fprintf (lnkfile, "-Y\n"); + } + + if (!(TARGET_Z80_LIKE)) /*Not for the z80, gbz80*/ + { + /* if iram size specified */ + if (options.iram_size) + fprintf (lnkfile, "-a 0x%04x\n", options.iram_size); + + /* if stack size specified*/ + if(options.stack_size) + fprintf (lnkfile, "-A 0x%02x\n", options.stack_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"); #define WRITE_SEG_LOC(N, L) \ + if (N) \ + { \ segName = Safe_strdup(N); \ c = strtok(segName, " \t"); \ fprintf (lnkfile,"-b %s = 0x%04x\n", c, L); \ - if (segName) { Safe_free(segName); } - - if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80)) /*Not for the z80, gbz80*/ - { - - /* code segment start */ - WRITE_SEG_LOC (CODE_NAME, options.code_loc); - - /* data segment start. If zero, the linker chooses - the best place for data*/ - if(options.data_loc){ - WRITE_SEG_LOC (DATA_NAME, options.data_loc); - } - - /* xdata start */ - WRITE_SEG_LOC (XDATA_NAME, options.xdata_loc); - - /* indirect data */ - if (IDATA_NAME) { - WRITE_SEG_LOC (IDATA_NAME, options.idata_loc); - } - - /* 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); - } - } - else /*For the z80, gbz80*/ - { - WRITE_SEG_LOC ("_CODE", options.code_loc); - WRITE_SEG_LOC ("_DATA", options.data_loc); - } - - /* If the port has any special linker area declarations, get 'em */ - if (port->extraAreas.genExtraAreaLinkOptions) - { - port->extraAreas.genExtraAreaLinkOptions(lnkfile); + if (segName) { Safe_free(segName); } \ } - /* add the extra linker options */ - fputStrSet(lnkfile, linkOptionsSet); + if (!(TARGET_Z80_LIKE)) /*Not for the z80, gbz80*/ + { - /* other library paths if specified */ - for (s = setFirstItem(libPathsSet); s != NULL; s = setNextItem(libPathsSet)) - fprintf (lnkfile, "-k %s\n", s); - - /* standard library path */ - if (!options.nostdlib) - { - if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80 || TARGET_IS_HC08)) /*Not for the z80, gbz80*/ + /* code segment start */ + WRITE_SEG_LOC (HOME_NAME, options.code_loc); + + /* data segment start. If zero, the linker chooses + the best place for data */ + if (options.data_loc) + { + WRITE_SEG_LOC (DATA_NAME, options.data_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); + } + + /* pdata/xstack segment start. If zero, the linker + chooses the best place for them */ + if (options.xstack_loc) + { + WRITE_SEG_LOC (PDATA_NAME, options.xstack_loc); + } + + /* indirect data */ + if (IDATA_NAME) + { + WRITE_SEG_LOC (IDATA_NAME, options.idata_loc); + } + + /* bit segment start */ + WRITE_SEG_LOC (BIT_NAME, 0); + + /* 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*/ + { + WRITE_SEG_LOC ("_CODE", options.code_loc); + WRITE_SEG_LOC ("_DATA", options.data_loc); + } + + /* If the port has any special linker area declarations, get 'em */ + if (port->extraAreas.genExtraAreaLinkOptions) + { + port->extraAreas.genExtraAreaLinkOptions(lnkfile); + } + + /* add the extra linker options */ + fputStrSet(lnkfile, linkOptionsSet); + + /* command line defined library paths if specified */ + for (s = setFirstItem(libPathsSet); s != NULL; s = setNextItem(libPathsSet)) + fprintf (lnkfile, "-k %s\n", s); + + /* standard library path */ + if (!options.nostdlib) { - switch (options.model) + if (!(TARGET_Z80_LIKE || TARGET_IS_HC08)) /*Not for the z80, gbz80*/ { + switch (options.model) + { case MODEL_SMALL: + if (options.stackAuto) + c = "small-stack-auto"; + else c = "small"; - break; + break; + case MODEL_MEDIUM: + if (options.stackAuto) + c = "medium-stack-auto"; + else + c = "medium"; + break; case MODEL_LARGE: + if (options.stackAuto) + c = "large-stack-auto"; + else c = "large"; - break; + break; case MODEL_FLAT24: - /* c = "flat24"; */ - if (TARGET_IS_DS390) + /* c = "flat24"; */ + if (TARGET_IS_DS390) { - c = "ds390"; + c = "ds390"; } - else if (TARGET_IS_DS400) + else if (TARGET_IS_DS400) { - c = "ds400"; + c = "ds400"; } - else + else { - fprintf(stderr, - "Add support for your FLAT24 target in %s @ line %d\n", - __FILE__, __LINE__); - exit(-1); + fprintf(stderr, + "Add support for your FLAT24 target in %s @ line %d\n", + __FILE__, __LINE__); + exit (EXIT_FAILURE); } - break; - case MODEL_PAGE0: - c = "xa51"; - break; - default: - werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); - c = "unknown"; - break; - } - } - else /*for the z80, gbz80*/ - { - if (TARGET_IS_HC08) + break; + case MODEL_PAGE0: + c = "xa51"; + break; + default: + werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); + c = "unknown"; + break; + } + } + else /*for the z80, gbz80*/ + { + if (TARGET_IS_HC08) c = "hc08"; - else if (TARGET_IS_Z80) + else if (TARGET_IS_Z80) c = "z80"; - else + else c = "gbz80"; - } - for (s = setFirstItem(libDirsSet); s != NULL; s = setNextItem(libDirsSet)) + } + for (s = setFirstItem(libDirsSet); s != NULL; s = setNextItem(libDirsSet)) mfprintf (lnkfile, getRuntimeVariables(), "-k %s{sep}%s\n", s, c); + } + /* command line defined library files if specified */ + for (s = setFirstItem(libFilesSet); s != NULL; s = setNextItem(libFilesSet)) + fprintf (lnkfile, "-l %s\n", s); /* standard library files */ -#if !OPT_DISABLE_DS390 - if (options.model == MODEL_FLAT24) + if (!options.nostdlib) { - 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 +#if !OPT_DISABLE_DS390 + if (options.model == MODEL_FLAT24) { - fprintf(stderr, + 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); - } - } + exit (EXIT_FAILURE); + } + } #endif -#if !OPT_DISABLE_XA51 +#if !OPT_DISABLE_XA51 #ifdef STD_XA51_LIB - if (options.model == MODEL_PAGE0) - { - fprintf (lnkfile, "-l %s\n", STD_XA51_LIB); - } + if (options.model == MODEL_PAGE0) + { + fprintf (lnkfile, "-l %s\n", STD_XA51_LIB); + } #endif #endif - if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80 - || TARGET_IS_HC08)) /*Not for the z80, gbz80*/ - { /*Why the z80 port is not using the standard libraries?*/ - fprintf (lnkfile, "-l %s\n", STD_LIB); - fprintf (lnkfile, "-l %s\n", STD_INT_LIB); - fprintf (lnkfile, "-l %s\n", STD_LONG_LIB); - fprintf (lnkfile, "-l %s\n", STD_FP_LIB); - } - else if (TARGET_IS_HC08) - { - fprintf (lnkfile, "-l hc08\n"); - } - else if (TARGET_IS_Z80) - { - fprintf (lnkfile, "-l z80\n"); + if (TARGET_IS_MCS51) + { + fprintf (lnkfile, "-l mcs51\n"); + } + if (!(TARGET_Z80_LIKE || TARGET_IS_HC08)) /*Not for the z80, gbz80*/ + { /*Why the z80 port is not using the standard libraries?*/ + fprintf (lnkfile, "-l %s\n", STD_LIB); + fprintf (lnkfile, "-l %s\n", STD_INT_LIB); + fprintf (lnkfile, "-l %s\n", STD_LONG_LIB); + fprintf (lnkfile, "-l %s\n", STD_FP_LIB); + } + else if (TARGET_IS_HC08) + { + fprintf (lnkfile, "-l hc08\n"); + } + else if (TARGET_IS_Z80) + { + fprintf (lnkfile, "-l z80\n"); + } + else if (TARGET_IS_GBZ80) + { + fprintf (lnkfile, "-l gbz80\n"); + } } - else if (TARGET_IS_GBZ80) + + /*For the z80 and gbz80 ports, try to find where crt0.o is... + 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_Z80_LIKE) && !options.no_std_crt0) /*For the z80, gbz80*/ { - fprintf (lnkfile, "-l gbz80\n"); - } - } + char crt0path[PATH_MAX]; + FILE * crt0fp; + set *tempSet=NULL; - /* additional libraries if any */ - for (s = setFirstItem(libFilesSet); s != NULL; s = setNextItem(libFilesSet)) - fprintf (lnkfile, "-l %s\n", s); - - /*For the z80 and gbz80 ports, try to find where crt0.o is... - 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*/ - { - char crt0path[PATH_MAX]; - FILE * crt0fp; - for (s = setFirstItem(libDirsSet); s != NULL; s = setNextItem(libDirsSet)) - { - sprintf (crt0path, "%s%s%s%scrt0.o", - s, DIR_SEPARATOR_STRING, c, DIR_SEPARATOR_STRING); - - crt0fp=fopen(crt0path, "r"); - if(crt0fp!=NULL)/*Found it!*/ - { - fclose(crt0fp); - #ifdef __CYGWIN__ - { - /*The CYGWIN version of the z80-gbz80 linker is getting confused with - windows paths, so convert them to the CYGWIN format*/ - char posix_path[PATH_MAX]; - void cygwin_conv_to_full_posix_path(char * win_path, char * posix_path); - cygwin_conv_to_full_posix_path(crt0path, posix_path); - strcpy(crt0path, posix_path); - } - #endif - fprintf (lnkfile, "%s\n", crt0path); - break; - } - } - if(s==NULL) fprintf (stderr, "Warning: couldn't find crt0.o\n"); - } + tempSet = appendStrSet(libDirsSet, NULL, DIR_SEPARATOR_STRING); + tempSet = appendStrSet(tempSet, NULL, c); + mergeSets(&tempSet, libPathsSet); - /* put in the object files */ - if (fullSrcFileName) - fprintf (lnkfile, "%s%s\n", dstFileName, port->linker.rel_ext); + for (s = setFirstItem(tempSet); s != NULL; s = setNextItem(tempSet)) + { + sprintf (crt0path, "%s%scrt0.o", + s, DIR_SEPARATOR_STRING); + + crt0fp=fopen(crt0path, "r"); + if(crt0fp!=NULL)/*Found it!*/ + { + fclose(crt0fp); + #ifdef __CYGWIN__ + { + /*The CYGWIN version of the z80-gbz80 linker is getting confused with + windows paths, so convert them to the CYGWIN format*/ + char posix_path[PATH_MAX]; + void cygwin_conv_to_full_posix_path(char * win_path, char * posix_path); + cygwin_conv_to_full_posix_path(crt0path, posix_path); + strcpy(crt0path, posix_path); + } + #endif + fprintf (lnkfile, "%s\n", crt0path); + break; + } + } + if(s==NULL) fprintf (stderr, "Warning: couldn't find crt0.o\n"); + } - fputStrSet(lnkfile, relFilesSet); + /* put in the object files */ + if (fullSrcFileName) + fprintf (lnkfile, "%s%s\n", dstFileName, port->linker.rel_ext); + + fputStrSet(lnkfile, relFilesSet); - fprintf (lnkfile, "\n-e\n"); - fclose (lnkfile); + fprintf (lnkfile, "\n-e\n"); + fclose (lnkfile); + } /* if(port->linker.needLinkerScript) */ if (options.verbose) printf ("sdcc: Calling linker...\n"); @@ -1566,28 +1768,56 @@ linkEdit (char **envp) /* strip ".rel" extension */ *strrchr (scratchFileName, '.') = '\0'; } - strncatz (scratchFileName, - options.out_fmt ? ".S19" : ".ihx", - sizeof(scratchFileName)); + strncatz (scratchFileName, + options.out_fmt ? ".S19" : ".ihx", + sizeof(scratchFileName)); } if (port->linker.cmd) { char buffer2[PATH_MAX]; + char buffer3[PATH_MAX]; + set *tempSet=NULL, *libSet=NULL; + + strcpy(buffer3, linkerScriptFileName); + if(/*TARGET_IS_PIC16 ||*/ TARGET_IS_PIC) { + + /* use $l to set the linker include directories */ + tempSet = appendStrSet(libDirsSet, "-I\"", "\""); + mergeSets(&linkOptionsSet, tempSet); + + tempSet = appendStrSet(libPathsSet, "-I\"", "\""); + mergeSets(&linkOptionsSet, tempSet); + + /* use $3 for libraries from command line --> libSet */ + mergeSets(&libSet, libFilesSet); + + tempSet = appendStrSet(relFilesSet, "", ""); + mergeSets(&libSet, tempSet); +// libSet = reverseSet(libSet); - /* VR 030517 - gplink needs linker options to set the linker script,*/ - buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, linkOptionsSet); + if(fullSrcFileName) { +// strcpy(buffer3, strrchr(fullSrcFileName, DIR_SEPARATOR_CHAR)+1); + /* if it didn't work, revert to old behaviour */ + if(!strlen(buffer3))strcpy(buffer3, dstFileName); + strcat(buffer3, port->linker.rel_ext); - buildCmdLine2 (buffer, sizeof(buffer), buffer2); + } else strcpy(buffer3, ""); + } + + buildCmdLine (buffer2, port->linker.cmd, buffer3, scratchFileName, (libSet?joinStrSet(libSet):NULL), linkOptionsSet); + + buildCmdLine2 (buffer, sizeof(buffer), buffer2); } else { buildCmdLine2 (buffer, sizeof(buffer), port->linker.mcmd); } -/* if (options.verbose)fprintf(stderr, "linker command line: %s\n", buffer); */ + /* if (options.verbose)fprintf(stderr, "linker command line: %s\n", buffer); */ system_ret = my_system (buffer); + /* TODO: most linker don't have a -o parameter */ /* -o option overrides default name? */ if (fullDstFileName) @@ -1608,14 +1838,16 @@ linkEdit (char **envp) strncpyz (scratchFileName, s, sizeof(scratchFileName)); /* strip ".rel" extension */ p = strrchr (scratchFileName, '.'); - if (p) - { - *p = 0; - } + if (p) + { + *p = 0; + } } strncatz (scratchFileName, - options.out_fmt ? ".S19" : ".ihx", - sizeof(scratchFileName)); + options.out_fmt ? ".S19" : ".ihx", + sizeof(scratchFileName)); + if (FILENAME_CMP (fullDstFileName, scratchFileName)) + remove (fullDstFileName); rename (scratchFileName, fullDstFileName); strncpyz (buffer, fullDstFileName, sizeof(buffer)); @@ -1630,11 +1862,15 @@ linkEdit (char **envp) strncatz (scratchFileName, ".map", sizeof(scratchFileName)); *q = 0; strncatz(buffer, ".map", sizeof(buffer)); + if (FILENAME_CMP (scratchFileName, buffer)) + remove (buffer); rename (scratchFileName, buffer); *p = 0; strncatz (scratchFileName, ".mem", sizeof(scratchFileName)); *q = 0; strncatz(buffer, ".mem", sizeof(buffer)); + if (FILENAME_CMP (scratchFileName, buffer)) + remove (buffer); rename (scratchFileName, buffer); if (options.debug) { @@ -1642,12 +1878,20 @@ linkEdit (char **envp) strncatz (scratchFileName, ".cdb", sizeof(scratchFileName)); *q = 0; strncatz(buffer, ".cdb", sizeof(buffer)); + if (FILENAME_CMP (scratchFileName, buffer)) + remove (buffer); + rename (scratchFileName, buffer); + /* and the OMF file without extension: */ + *p = 0; + *q = 0; + if (FILENAME_CMP (scratchFileName, buffer)) + remove (buffer); rename (scratchFileName, buffer); } } if (system_ret) { - exit (1); + exit (EXIT_FAILURE); } } @@ -1665,34 +1909,36 @@ assemble (char **envp) } else { /* the assembled file gets the name of the first modul */ strncpyz (scratchFileName, dstFileName, sizeof(scratchFileName)); - strncatz (scratchFileName, port->linker.rel_ext, - sizeof(scratchFileName)); + strncatz (scratchFileName, port->linker.rel_ext, + sizeof(scratchFileName)); } if (port->assembler.do_assemble) { - port->assembler.do_assemble(asmOptionsSet); - return ; + port->assembler.do_assemble(asmOptionsSet); + return ; } else if (port->assembler.cmd) { buildCmdLine (buffer, port->assembler.cmd, dstFileName, scratchFileName, - options.debug ? port->assembler.debug_opts : port->assembler.plain_opts, - asmOptionsSet); + options.debug ? port->assembler.debug_opts : port->assembler.plain_opts, + asmOptionsSet); } else { - buildCmdLine2 (buffer, sizeof(buffer), port->assembler.mcmd); + buildCmdLine2 (buffer, sizeof(buffer), port->assembler.mcmd); } if (my_system (buffer)) { - /* either system() or the assembler itself has reported an error - perror ("Cannot exec assembler"); - */ - exit (1); + /* either system() or the assembler itself has reported an error + perror ("Cannot exec assembler"); + */ + exit (EXIT_FAILURE); } /* 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)); + strncatz (scratchFileName, + port->linker.rel_ext, + sizeof(scratchFileName)); + if (strcmp (scratchFileName, fullDstFileName)) + remove (fullDstFileName); rename (scratchFileName, fullDstFileName); } } @@ -1712,55 +1958,101 @@ 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 dollar signs in identifiers */ + if (options.dollars_in_ident) + addSet(&preArgvSet, Safe_strdup("-fdollars-in-identifiers")); + /* if using external stack define the macro */ if (options.useXstack) - addSet(&preArgvSet, Safe_strdup("-DSDCC_USE_XSTACK")); + addSet(&preArgvSet, Safe_strdup("-DSDCC_USE_XSTACK")); /* set the macro for stack autos */ if (options.stackAuto) - addSet(&preArgvSet, Safe_strdup("-DSDCC_STACK_AUTO")); + addSet(&preArgvSet, Safe_strdup("-DSDCC_STACK_AUTO")); /* set the macro for stack autos */ if (options.stack10bit) - addSet(&preArgvSet, Safe_strdup("-DSDCC_STACK_TENBIT")); + addSet(&preArgvSet, Safe_strdup("-DSDCC_STACK_TENBIT")); /* set the macro for no overlay */ if (options.noOverlay) addSet(&preArgvSet, Safe_strdup("-DSDCC_NOOVERLAY")); + if (options.unsigned_char) + addSet(&preArgvSet, Safe_strdup("-DSDCC_CHAR_UNSIGNED")); + /* set the macro for large model */ switch (options.model) - { - case MODEL_LARGE: - addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_LARGE")); - break; - case MODEL_SMALL: - addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_SMALL")); - break; - case MODEL_COMPACT: - addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_COMPACT")); - break; - case MODEL_MEDIUM: - addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_MEDIUM")); - break; - case MODEL_FLAT24: - addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_FLAT24")); - break; - case MODEL_PAGE0: - addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_PAGE0")); - break; - default: - werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); - break; - } + { + case MODEL_LARGE: + addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_LARGE")); + break; + case MODEL_SMALL: + addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_SMALL")); + break; + case MODEL_COMPACT: + addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_COMPACT")); + break; + case MODEL_MEDIUM: + addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_MEDIUM")); + break; + case MODEL_FLAT24: + addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_FLAT24")); + break; + case MODEL_PAGE0: + addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_PAGE0")); + break; + default: + werror (W_UNKNOWN_MODEL, __FILE__, __LINE__); + break; + } + + /* set macro corresponding to compiler option */ + if (options.intlong_rent) + addSet(&preArgvSet, Safe_strdup("-DSDCC_INT_LONG_REENT")); + + /* set macro corresponding to compiler option */ + if (options.float_rent) + addSet(&preArgvSet, Safe_strdup("-DSDCC_FLOAT_REENT")); + + /* add SDCC version number */ + { + char buf[20]; + SNPRINTF(buf, sizeof(buf), "-DSDCC=%d%d%d", + SDCC_VERSION_HI, SDCC_VERSION_LO, SDCC_VERSION_P); + addSet(&preArgvSet, Safe_strdup(buf)); + } + + /* add SDCC revision number */ + { + char buf[25]; + SNPRINTF(buf, sizeof(buf), "-DSDCC_REVISION=%s", getBuildNumber()); + addSet(&preArgvSet, Safe_strdup(buf)); + } /* add port (processor information to processor */ addSet(&preArgvSet, Safe_strdup("-DSDCC_{port}")); addSet(&preArgvSet, Safe_strdup("-D__{port}")); + if (port && port->processor && TARGET_IS_PIC) { + char proc[512]; + SNPRINTF(&proc[0], 512, "-DSDCC_PROCESSOR=\"%s\"", port->processor); + addSet(&preArgvSet, Safe_strdup(proc)); + } + /* standard include path */ if (!options.nostdinc) { - inclList = appendStrSet(includeDirsSet, "-I\"", "\""); + inclList = appendStrSet(includeDirsSet, "-isystem \"", "\""); mergeSets(&preArgvSet, inclList); } @@ -1770,35 +2062,33 @@ preProcess (char **envp) deleteSet(&inclList); if (preProcOnly && fullDstFileName) - { - /* -E and -o given */ - setMainValue ("cppoutfilename", fullDstFileName); - } + { + /* -E and -o given */ + setMainValue ("cppoutfilename", fullDstFileName); + } else - { - /* Piping: set cppoutfilename to NULL, to avoid empty quotes */ - setMainValue ("cppoutfilename", NULL); - } + { + /* Piping: set cppoutfilename to NULL, to avoid empty quotes */ + setMainValue ("cppoutfilename", NULL); + } if (options.verbose) - printf ("sdcc: Calling preprocessor...\n"); - + printf ("sdcc: Calling preprocessor...\n"); buildCmdLine2 (buffer, sizeof(buffer), _preCmd); if (preProcOnly) { if (my_system (buffer)) { - exit (1); - } + exit (EXIT_FAILURE); + } - exit (0); + exit (EXIT_SUCCESS); } yyin = my_popen (buffer); if (yyin == NULL) { perror ("Preproc file not found"); - exit (1); + exit (EXIT_FAILURE); } - addSetHead (&pipeSet, yyin); } return 0; @@ -1806,9 +2096,9 @@ preProcess (char **envp) /* Set bin paths */ static void -setBinPaths(const char *argv0) +setBinPaths (const char *argv0) { - char *p; + const char *p; char buf[PATH_MAX]; /* @@ -1822,49 +2112,61 @@ setBinPaths(const char *argv0) /* do it in reverse mode, so that addSetHead() can be used instead of slower addSet() */ - 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 ((p = getBinPath (argv0)) != NULL) + addSetHead (&binPathSet, (void *)p); - if (options.printSearchDirs) { - printf("programs:\n"); - fputStrSet(stdout, binPathSet); + if ((p = getenv (SDCC_DIR_NAME)) != NULL) { + SNPRINTF (buf, sizeof buf, "%s" PREFIX2BIN_DIR, p); + addSetHead (&binPathSet, Safe_strdup (buf)); } } /* Set system include path */ static void -setIncludePath(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; - if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL) - addSetHead(&includeDirsSet, p); + tempSet = appendStrSet (dataDirsSet, NULL, INCLUDE_DIR_SUFFIX); + includeDirsSet = appendStrSet (tempSet, NULL, DIR_SEPARATOR_STRING); + includeDirsSet = appendStrSet (includeDirsSet, NULL, port->target); + mergeSets (&includeDirsSet, tempSet); - if (options.printSearchDirs) { - printf("includedir:\n"); - fputStrSet(stdout, includeDirsSet); - } + if ((p = getenv (SDCC_INCLUDE_NAME)) != NULL) + { + addSetHead(&includeDirsSet, p); + 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); + } + } } /* Set system lib path */ static void -setLibPath(void) +setLibPath (void) { char *p; @@ -1877,22 +2179,20 @@ setLibPath(void) * 4. - DATADIR/LIB_DIR_SUFFIX/ (only on *nix) */ - libDirsSet = appendStrSet(dataDirsSet, NULL, LIB_DIR_SUFFIX); + if (options.nostdlib) + return; - if ((p = getenv(SDCC_LIB_NAME)) != NULL) - addSetHead(&libDirsSet, p); + libDirsSet = appendStrSet (dataDirsSet, NULL, LIB_DIR_SUFFIX); - if (options.printSearchDirs) { - printf("libdir:\n"); - fputStrSet(stdout, libDirsSet); - } + if ((p = getenv (SDCC_LIB_NAME)) != NULL) + addSetHead (&libDirsSet, p); } /* Set data path */ static void -setDataPaths(const char *argv0) +setDataPaths (const char *argv0) { - char *p; + const char *p; char buf[PATH_MAX]; /* @@ -1903,32 +2203,28 @@ setDataPaths(const char *argv0) * 3. - DATADIR (only on *nix) */ - if ((p = getenv(SDCC_DIR_NAME)) != NULL) { - SNPRINTF(buf, sizeof buf, "%s" PREFIX2DATA_DIR, p); - addSet(&dataDirsSet, Safe_strdup(buf)); + if ((p = getenv (SDCC_DIR_NAME)) != NULL) { + SNPRINTF (buf, sizeof buf, "%s" PREFIX2DATA_DIR, p); + addSet (&dataDirsSet, Safe_strdup (buf)); } - if ((p = getBinPath(argv0)) != NULL) { - SNPRINTF(buf, sizeof buf, "%s" BIN2DATA_DIR, p); - addSet(&dataDirsSet, Safe_strdup(buf)); + if ((p = getBinPath (argv0)) != NULL) { + SNPRINTF (buf, sizeof buf, "%s" BIN2DATA_DIR, p); + Safe_free ((void *)p); + addSet (&dataDirsSet, Safe_strdup(buf)); } #ifdef _WIN32 - if (peekSet(dataDirsSet) == NULL) { + if (peekSet (dataDirsSet) == NULL) { /* this should never happen... */ - wassertl(0, "Can't get binary path"); + wassertl (0, "Can't get binary path"); } #else - addSet(&dataDirsSet, Safe_strdup(DATADIR)); + addSet (&dataDirsSet, Safe_strdup (DATADIR)); #endif - if (options.printSearchDirs) { - printf("datadir:\n"); - fputStrSet(stdout, dataDirsSet); - } - - setIncludePath(); - setLibPath(); + setIncludePath (); + setLibPath (); } static void @@ -1961,8 +2257,39 @@ initValues (void) setMainValue ("linkdstfilename", "{stdlinkdstfilename}"); } + /* + * Make sure the preprocessor is called with the "-std" option + * corresponding to the --std used to start sdcc + */ + if (options.std_c99) + { + if (!options.std_sdcc) + setMainValue ("cppstd", "-std=c99 "); + } + else + { + if (!options.std_sdcc) + setMainValue ("cppstd", "-std=c89 "); + } +} + +static void doPrintSearchDirs(void) +{ + printf("programs:\n"); + fputStrSet(stdout, binPathSet); + + printf("datadir:\n"); + fputStrSet(stdout, dataDirsSet); + + printf("includedir:\n"); + fputStrSet(stdout, includeDirsSet); + + printf("libdir:\n"); + fputStrSet(stdout, libDirsSet); + fputStrSet(stdout, libPathsSet); } + static void sig_handler (int signal) { @@ -1987,7 +2314,7 @@ sig_handler (int signal) break; } fprintf (stderr, "Caught signal %d: %s\n", signal, sig_string); - exit (1); + exit (EXIT_FAILURE); } /* @@ -2001,23 +2328,19 @@ main (int argc, char **argv, char **envp) /* turn all optimizations off by default */ memset (&optimize, 0, sizeof (struct optimize)); - /*printVersionInfo (); */ - - if (NUM_PORTS==0) { - fprintf (stderr, "Build error: no ports are enabled.\n"); - exit (1); - } - - /* install atexit handler */ - atexit(rm_tmpfiles); + if (NUM_PORTS == 0) + { + fprintf (stderr, "Build error: no ports are enabled.\n"); + exit (EXIT_FAILURE); + } /* install signal handler; - it's only purpuse is to call exit() to remove temp files */ - if (!getenv("SDCC_LEAVE_SIGNALS")) + it's only purpose 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 (SIGINT, sig_handler); signal (SIGSEGV, sig_handler); } @@ -2030,9 +2353,9 @@ main (int argc, char **argv, char **envp) _findPort (argc, argv); #ifdef JAMIN_DS390 - if (strcmp(port->target, "mcs51") == 0) { - printf("DS390 jammed in A\n"); - _setPort ("ds390"); + if (strcmp (port->target, "mcs51") == 0) { + printf ("DS390 jammed in A\n"); + _setPort ("ds390"); ds390_jammed = 1; } #endif @@ -2050,27 +2373,44 @@ 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]); + + setBinPaths (argv[0]); + setDataPaths (argv[0]); + + if (port->initPaths) + port->initPaths(); + + if (options.printSearchDirs) + doPrintSearchDirs(); /* if no input then printUsage & exit */ - if (!options.c1mode && !fullSrcFileName && peekSet(relFilesSet) == NULL) { - if (!options.printSearchDirs) + if (!options.c1mode && !fullSrcFileName && peekSet(relFilesSet) == NULL) + { + if (options.printSearchDirs) + exit (EXIT_SUCCESS); printUsage(); - - exit(0); - } + exit (EXIT_FAILURE); + } /* initMem() is expensive, but initMem() must called before port->finaliseOptions (). And the z80 port needs port->finaliseOptions(), even if we're only linking. */ initMem (); + + /* finalize target specific options */ port->finaliseOptions (); + /* finalize common options */ + finalizeOptions (); + if (fullSrcFileName || options.c1mode) { preProcess (envp); @@ -2082,27 +2422,30 @@ main (int argc, char **argv, char **envp) initPeepHole (); if (options.verbose) - printf ("sdcc: Generating code...\n"); + printf ("sdcc: Generating code...\n"); yyparse (); - pclose(yyin); - deleteSetItem(&pipeSet, yyin); + if (!options.c1mode) + if (pclose(yyin)) + fatalError = 1; - if (fatalError) { - exit (1); - } + if (fatalError) + exit (EXIT_FAILURE); if (port->general.do_glue != NULL) - (*port->general.do_glue)(); + (*port->general.do_glue) (); else { /* this shouldn't happen */ - assert(FALSE); + assert (FALSE); /* in case of NDEBUG */ - glue(); + glue (); } + if (fatalError) + exit (EXIT_FAILURE); + if (!options.c1mode && !noAssemble) { if (options.verbose) @@ -2113,18 +2456,21 @@ main (int argc, char **argv, char **envp) closeDumpFiles(); if (options.debug && debugFile) - debugFile->closeFile(); + debugFile->closeFile (); if (!options.cc_only && !fatalError && !noAssemble && !options.c1mode && - (fullSrcFileName || peekSet(relFilesSet) != NULL)) + (fullSrcFileName || peekSet (relFilesSet) != NULL)) { + if (options.verbose) + printf ("sdcc: Calling linker...\n"); + if (port->linker.do_link) - port->linker.do_link (); + port->linker.do_link (); else - linkEdit (envp); + linkEdit (envp); } return 0;