char scratchFileName[PATH_MAX];
char buffer[PATH_MAX * 2];
-#define OPTION_HELP "-help"
-
#define LENGTH(_a) (sizeof(_a)/sizeof(*(_a)))
+#define OPTION_HELP "--help"
#define OPTION_STACK_8BIT "--stack-8bit"
#define OPTION_OUT_FMT_IHX "--out-fmt-ihx"
#define OPTION_OUT_FMT_S19 "--out-fmt-s19"
static const OPTION
optionsTable[] = {
{ 0, NULL, NULL, "General options" },
- { 0, "--help", NULL, "Display this help" },
+ { 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" },
{ 'o', NULL, NULL, "Place the output into the given path resp. file" },
{ 0, OPTION_PRINT_SEARCH_DIRS, &options.printSearchDirs, "display the directories in the compiler's search path"},
{ 0, OPTION_MSVC_ERROR_STYLE, &options.vc_err_style, "messages are compatible with Micro$oft visual studio"},
- { 0, OPTION_USE_STDOUT, &options.use_stdout, "send errors to stdout instead of stderr"},
+ { 0, 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_XRAM_LOC, NULL, "<nnnn> External Ram start location" },
{ 0, OPTION_XRAM_SIZE, NULL, "<nnnn> External Ram size" },
{ 0, OPTION_IRAM_SIZE, NULL, "<nnnn> Internal Ram size" },
- { 0, OPTION_XSTACK_LOC, NULL, "<nnnn> External Ram start location" },
+ { 0, OPTION_XSTACK_LOC, NULL, "<nnnn> External Stack start location" },
{ 0, OPTION_CODE_LOC, NULL, "<nnnn> Code Segment Location" },
{ 0, OPTION_CODE_SIZE, NULL, "<nnnn> Code Segment size" },
{ 0, OPTION_STACK_LOC, NULL, "<nnnn> Stack pointer initial value" },
{ 0, OPTION_DATA_LOC, NULL, "<nnnn> Direct data start location" },
{ 0, OPTION_IDATA_LOC, NULL, NULL },
+#if !OPT_DISABLE_DS390 || !OPT_DISABLE_MCS51 || !OPT_DISABLE_PIC
+ { 0, OPTION_STACK_SIZE, NULL,"MCS51/DS390/PIC - Tells the linker to allocate this space for stack"},
+#endif
#if !OPT_DISABLE_DS390 || !OPT_DISABLE_MCS51
- { 0, OPTION_STACK_SIZE, NULL,"MCS51/DS390 - Tells the linker to allocate this space for stack"},
{ 0, OPTION_PACK_IRAM, NULL,"MCS51/DS390 - Tells the linker to pack variables in internal ram (default)"},
{ 0, OPTION_NO_PACK_IRAM, &options.no_pack_iram,"MCS51/DS390 - Tells the linker not to pack variables in internal ram"},
#endif
NULL
};
-static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 -DSDCC=1 {cppextraopts} \"{fullsrcfilename}\" \"{cppoutfilename}\"";
+static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 {cppextraopts} \"{fullsrcfilename}\" \"{cppoutfilename}\"";
PORT *port;
/* printVersionInfo - prints the version info */
/*-----------------------------------------------------------------*/
void
-printVersionInfo (void)
+printVersionInfo (FILE *stream)
{
int i;
- fprintf (stderr,
+ fprintf (stream,
"SDCC : ");
for (i = 0; i < NUM_PORTS; i++)
- fprintf (stderr, "%s%s", i == 0 ? "" : "/", _ports[i]->target);
+ fprintf (stream, "%s%s", i == 0 ? "" : "/", _ports[i]->target);
- fprintf (stderr, " " SDCC_VERSION_STR
+ fprintf (stream, " " SDCC_VERSION_STR
#ifdef SDCC_SUB_VERSION_STR
"/" SDCC_SUB_VERSION_STR
#endif
}
static void
-printOptions(const OPTION *optionsTable)
+printOptions(const OPTION *optionsTable, FILE *stream)
{
int i;
for (i = 0;
if (!optionsTable[i].shortOpt && !optionsTable[i].longOpt
&& optionsTable[i].help)
{
- fprintf (stdout, "\n%s:\n", optionsTable[i].help);
+ fprintf (stream, "\n%s:\n", optionsTable[i].help);
}
else
{
- fprintf(stdout, " %c%c %-20s %s\n",
+ 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 : "",
/*-----------------------------------------------------------------*/
/* 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);
+ 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((unsigned char)*src))
- src++;
+ ++src;
/* skip the trailing white spaces */
- length = strlen(src);
- while (length && isspace((unsigned char)src[length-1]))
- src[--length] = '\0';
+ end = &src[strlen(src) - 1];
+ while (end >= src && isspace((unsigned char)*end))
+ --end;
+ ++end;
+
+ dbuf_init(&dbuf, 16);
+
+ p = src;
+ while (src < end)
+ {
+ while (p < end && ',' != *p)
+ ++p;
+ dbuf_append(&dbuf, src, p - src);
+ addSet(dest, Safe_strdup(dbuf_c_str(&dbuf)));
+ dbuf_set_size(&dbuf, 0);
+ src = ++p;
+ }
- for (p = strtok(src, ","); p != NULL; p = strtok(NULL, ","))
- addSet(dest, Safe_strdup(p));
+ dbuf_destroy(&dbuf);
}
/*-----------------------------------------------------------------*/
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;
/* is the dot in the filename, not in the path? */
(strrchr (buffer, DIR_SEPARATOR_CHAR) < strrchr (buffer, '.')))
{
- *strrchr (buffer, '.') = '\0';
+ *strrchr (buffer, '.') = '\0';
}
/* get rid of any path information
*(fext - 1) != DIR_SEPARATOR_CHAR &&
*(fext - 1) != ':')
{
- fext--;
+ fext--;
}
#else
/* do this by going backwards till we
}
/* if the extention is type .rel or .r or .REL or .R
- addtional object file will be passed to the linker */
+ additional 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)
{
werror (E_ARGUMENT_MISSING, szStart);
/* Die here rather than checking for errors later. */
- exit(-1);
+ exit(EXIT_FAILURE);
}
else
{
/* options */
if (argv[i][0] == '-' && argv[i][1] == '-')
{
+ 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 (0);
+ exit (EXIT_SUCCESS);
}
if (strcmp (argv[i], OPTION_STACK_8BIT) == 0)
if (strcmp (argv[i], OPTION_VERSION) == 0)
{
- printVersionInfo ();
- exit (0);
+ printVersionInfo (stdout);
+ exit (EXIT_SUCCESS);
continue;
}
verifyShortOption(argv[i]);
printUsage ();
- exit (0);
+ exit (EXIT_SUCCESS);
break;
case 'm':
case 'v':
verifyShortOption(argv[i]);
- printVersionInfo ();
+ printVersionInfo (stdout);
exit (0);
break;
werror (E_FILE_OPEN_ERR, scratchFileName);
}
MSVC_style(options.vc_err_style);
- if(options.use_stdout) dup2(STDOUT_FILENO, STDERR_FILENO);
return 0;
}
exit (1);
}
- if (TARGET_IS_Z80 || TARGET_IS_GBZ80)
+ if (TARGET_Z80_LIKE)
{
fprintf (lnkfile, "--\n-m\n-j\n-x\n-%c %s\n",
out_fmt, dstFileName);
fprintf (lnkfile, "-Y\n");
}
- if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80)) /*Not for the z80, gbz80*/
+ if (!(TARGET_Z80_LIKE)) /*Not for the z80, gbz80*/
{
/* if iram size specified */
if (options.iram_size)
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*/
+ if (!(TARGET_Z80_LIKE)) /*Not for the z80, gbz80*/
{
/* code segment start */
/* data segment start. If zero, the linker chooses
the best place for data */
- if(options.data_loc)
+ 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)
+ 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)
{
/* standard library path */
if (!options.nostdlib)
{
- if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80 || TARGET_IS_HC08)) /*Not for the z80, gbz80*/
+ if (!(TARGET_Z80_LIKE || TARGET_IS_HC08)) /*Not for the z80, gbz80*/
{
switch (options.model)
{
fprintf(stderr,
"Add support for your FLAT24 target in %s @ line %d\n",
__FILE__, __LINE__);
- exit(-1);
+ exit(EXIT_FAILURE);
}
break;
case MODEL_PAGE0:
fprintf(stderr,
"Add support for your FLAT24 target in %s @ line %d\n",
__FILE__, __LINE__);
- exit(-1);
+ exit(EXIT_FAILURE);
}
}
#endif
{
fprintf (lnkfile, "-l mcs51\n");
}
- if (!(TARGET_IS_Z80 || TARGET_IS_GBZ80
- || TARGET_IS_HC08)) /*Not for the z80, gbz80*/
+ 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);
/*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) /*For the z80, gbz80*/
+ if ((TARGET_Z80_LIKE) && !options.no_std_crt0) /*For the z80, gbz80*/
{
char crt0path[PATH_MAX];
FILE * crt0fp;
set *tempSet=NULL, *libSet=NULL;
strcpy(buffer3, linkerScriptFileName);
- if(TARGET_IS_PIC16 || TARGET_IS_PIC) {
+ if(/*TARGET_IS_PIC16 ||*/ TARGET_IS_PIC) {
/* use $l to set the linker include directories */
tempSet = appendStrSet(libDirsSet, "-I\"", "\"");
/* if (options.verbose)fprintf(stderr, "linker command line: %s\n", buffer); */
system_ret = my_system (buffer);
+
+#ifdef _WIN32
+ #define STRCMP stricmp
+#else
+ #define STRCMP strcmp
+#endif
+
/* TODO: most linker don't have a -o parameter */
/* -o option overrides default name? */
if (fullDstFileName)
strncatz (scratchFileName,
options.out_fmt ? ".S19" : ".ihx",
sizeof(scratchFileName));
- if (strcmp (fullDstFileName, scratchFileName))
- unlink (fullDstFileName);
+ if (STRCMP (fullDstFileName, scratchFileName))
+ remove (fullDstFileName);
rename (scratchFileName, fullDstFileName);
strncpyz (buffer, fullDstFileName, sizeof(buffer));
strncatz (scratchFileName, ".map", sizeof(scratchFileName));
*q = 0;
strncatz(buffer, ".map", sizeof(buffer));
- if (strcmp (scratchFileName, buffer))
- unlink (buffer);
+ if (STRCMP (scratchFileName, buffer))
+ remove (buffer);
rename (scratchFileName, buffer);
*p = 0;
strncatz (scratchFileName, ".mem", sizeof(scratchFileName));
*q = 0;
strncatz(buffer, ".mem", sizeof(buffer));
- if (strcmp (scratchFileName, buffer))
- unlink (buffer);
+ if (STRCMP (scratchFileName, buffer))
+ remove (buffer);
rename (scratchFileName, buffer);
if (options.debug)
{
strncatz (scratchFileName, ".cdb", sizeof(scratchFileName));
*q = 0;
strncatz(buffer, ".cdb", sizeof(buffer));
- if (strcmp (scratchFileName, buffer))
- unlink (buffer);
+ if (STRCMP (scratchFileName, buffer))
+ remove (buffer);
rename (scratchFileName, buffer);
/* and the OMF file without extension: */
*p = 0;
*q = 0;
- if (strcmp (scratchFileName, buffer))
- unlink (buffer);
+ if (STRCMP (scratchFileName, buffer))
+ remove (buffer);
rename (scratchFileName, buffer);
}
}
port->linker.rel_ext,
sizeof(scratchFileName));
if (strcmp (scratchFileName, fullDstFileName))
- unlink (fullDstFileName);
+ remove (fullDstFileName);
rename (scratchFileName, fullDstFileName);
}
}
break;
}
+ /* 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 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\"", "\"");
/* 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);
atexit(rm_tmpfiles);
/* install signal handler;
- it's only purpuse is to call exit() to remove temp files */
+ it's only purpose is to call exit() to remove temp files */
if (!getenv("SDCC_LEAVE_SIGNALS"))
{
signal (SIGABRT, sig_handler);
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 ().
projects / fw / sdcc / blobdiff