X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=9d6a445d4ba114194e796e25b5a3a6be9ab7155d;hb=998bc7b7fc11e191943ed839f790fff34b78df3b;hp=55338496184b6eee7e4be80eee4abfedbbe1cd8b;hpb=21274f2a0c9745e384401c6398497b5abf65d8e4;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 55338496..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,7 +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 *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 @@ -139,6 +140,8 @@ char buffer[PATH_MAX * 2]; #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[] = { @@ -173,12 +176,12 @@ optionsTable[] = { { 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"}, + + { 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)" }, @@ -215,7 +218,9 @@ optionsTable[] = { { 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" }, @@ -230,7 +235,7 @@ optionsTable[] = { { 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 }, @@ -242,7 +247,7 @@ optionsTable[] = { { 0, "--dumptree", &options.dump_tree, "dump front-end AST before generating iCode" }, { 0, OPTION_DUMP_ALL, NULL, "Dump the internal structure at all stages" }, { 0, OPTION_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" }, @@ -263,7 +268,7 @@ optionsTable[] = { { 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 } }; @@ -371,7 +376,6 @@ static void _setProcessor (char *_processor) { port->processor = _processor; - fprintf(stderr,"Processor: %s\n",_processor); } static void @@ -408,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 */ @@ -525,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, ",")) @@ -544,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; @@ -556,8 +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.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; @@ -653,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; } @@ -992,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; } @@ -1094,7 +1100,7 @@ parseCmdLine (int argc, char **argv) options.std_sdcc = 0; continue; } - + if (strcmp (argv[i], OPTION_STD_C99) == 0) { options.std_c99 = 1; @@ -1108,7 +1114,7 @@ parseCmdLine (int argc, char **argv) options.std_sdcc = 1; continue; } - + if (strcmp (argv[i], OPTION_STD_SDCC99) == 0) { options.std_c99 = 1; @@ -1116,6 +1122,18 @@ parseCmdLine (int argc, char **argv) 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]); @@ -1427,6 +1445,7 @@ linkEdit (char **envp) const char *s; char linkerScriptFileName[PATH_MAX]; + linkerScriptFileName[0] = 0; if(port->linker.needLinkerScript) { @@ -1500,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 */ @@ -1559,10 +1578,22 @@ linkEdit (char **envp) switch (options.model) { case MODEL_SMALL: - c = "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"; */ @@ -1755,7 +1786,7 @@ linkEdit (char **envp) set *tempSet=NULL, *libSet=NULL; strcpy(buffer3, linkerScriptFileName); - if(TARGET_IS_PIC16) { + if(/*TARGET_IS_PIC16 ||*/ TARGET_IS_PIC) { /* use $l to set the linker include directories */ tempSet = appendStrSet(libDirsSet, "-I\"", "\""); @@ -1932,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")); @@ -2002,7 +2043,6 @@ preProcess (char **envp) if (options.verbose) printf ("sdcc: Calling preprocessor...\n"); - buildCmdLine2 (buffer, sizeof(buffer), _preCmd); if (preProcOnly) { @@ -2049,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 */ @@ -2099,13 +2132,6 @@ setIncludePath(void) addSetHead(&includeDirsSet, p2); } } - -#if 0 - if (options.printSearchDirs) { - printf("includedir:\n"); - fputStrSet(stdout, includeDirsSet); - } -#endif } /* Set system lib path */ @@ -2130,13 +2156,6 @@ setLibPath(void) 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 */ @@ -2173,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(); } @@ -2302,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 @@ -2320,8 +2332,12 @@ 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]); @@ -2403,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