/* 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;
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
#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[] = {
{ 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, "--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, "<name> use this name for the code segment" },
+ { 0, OPTION_CONST_SEG, NULL, "<name> 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_PEEP_FILE, NULL, "<file> use this extra peephole file" },
{ 0, OPTION_OPT_CODE_SPEED, NULL, "Optimize for code speed rather than size" },
{ 0, OPTION_OPT_CODE_SIZE, NULL, "Optimize for code size rather than speed" },
-
+
{ 0, NULL, NULL, "Internal debugging options"},
{ 0, "--dumpraw", &options.dump_raw, "Dump the internal structure after the initial parse" },
{ 0, "--dumpgcse", &options.dump_gcse, NULL },
{ 0, "--dumptree", &options.dump_tree, "dump front-end AST before generating iCode" },
{ 0, OPTION_DUMP_ALL, NULL, "Dump the internal structure at all stages" },
{ 0, OPTION_ICODE_IN_ASM, &options.iCodeInAsm, "include i-code as comments in the asm file"},
-
+
{ 0, NULL, NULL, "Linker options" },
{ 'l', NULL, NULL, "Include the given library in the link" },
{ 'L', NULL, NULL, "Add the next field to the library search path" },
{ 0, OPTION_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 }
};
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, ","))
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;
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;
moduleName = Safe_strdup ( fext );
for (fext = moduleName; *fext; fext++)
- if (!isalnum (*fext))
+ if (!isalnum ((unsigned char)*fext))
*fext = '_';
return;
}
options.std_sdcc = 0;
continue;
}
-
+
if (strcmp (argv[i], OPTION_STD_C99) == 0)
{
options.std_c99 = 1;
options.std_sdcc = 1;
continue;
}
-
+
if (strcmp (argv[i], OPTION_STD_SDCC99) == 0)
{
options.std_c99 = 1;
continue;
}
+ if (strcmp (argv[i], OPTION_CODE_SEG) == 0)
+ {
+ options.code_seg = getStringArg(OPTION_CODE_SEG, argv, &i, argc);
+ continue;
+ }
+
+ if (strcmp (argv[i], OPTION_CONST_SEG) == 0)
+ {
+ options.const_seg = getStringArg(OPTION_CONST_SEG, argv, &i, argc);
+ continue;
+ }
+
if (!port->parseOption (&argc, argv, &i))
{
werror (W_UNKNOWN_OPTION, argv[i]);
char *segName, *c;
int system_ret;
const char *s;
+ char linkerScriptFileName[PATH_MAX];
+ linkerScriptFileName[0] = 0;
if(port->linker.needLinkerScript)
{
}
/* first we need to create the <filename>.lnk file */
- SNPRINTF (scratchFileName, sizeof(scratchFileName),
+ SNPRINTF (linkerScriptFileName, sizeof(scratchFileName),
"%s.lnk", dstFileName);
- if (!(lnkfile = fopen (scratchFileName, "w")))
+ if (!(lnkfile = fopen (linkerScriptFileName, "w")))
{
- werror (E_FILE_OPEN_ERR, scratchFileName);
+ werror (E_FILE_OPEN_ERR, linkerScriptFileName);
exit (1);
}
{
/* 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 */
char buffer3[PATH_MAX];
set *tempSet=NULL, *libSet=NULL;
- strcpy(buffer3, dstFileName);
- if(TARGET_IS_PIC16) {
+ strcpy(buffer3, linkerScriptFileName);
+ if(TARGET_IS_PIC16 || TARGET_IS_PIC) {
/* use $l to set the linker include directories */
tempSet = appendStrSet(libDirsSet, "-I\"", "\"");
setIncludePath(void)
{
char *p;
+ char *p2=NULL;
set *tempSet=NULL;
/*
mergeSets(&includeDirsSet, tempSet);
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);
+ }
+ }
#if 0
if (options.printSearchDirs) {