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" },
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;
_setProcessor (char *_processor)
{
port->processor = _processor;
- fprintf(stderr,"Processor: %s\n",_processor);
}
static void
/* 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);
}
/*-----------------------------------------------------------------*/
/* 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;
}
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\"", "\"");
options.out_fmt ? ".S19" : ".ihx",
sizeof(scratchFileName));
if (strcmp (fullDstFileName, scratchFileName))
- unlink (fullDstFileName);
+ remove (fullDstFileName);
rename (scratchFileName, fullDstFileName);
strncpyz (buffer, fullDstFileName, sizeof(buffer));
*q = 0;
strncatz(buffer, ".map", sizeof(buffer));
if (strcmp (scratchFileName, buffer))
- unlink (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);
+ remove (buffer);
rename (scratchFileName, buffer);
if (options.debug)
{
*q = 0;
strncatz(buffer, ".cdb", sizeof(buffer));
if (strcmp (scratchFileName, buffer))
- unlink (buffer);
+ remove (buffer);
rename (scratchFileName, buffer);
/* and the OMF file without extension: */
*p = 0;
*q = 0;
if (strcmp (scratchFileName, buffer))
- unlink (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\"", "\"");
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 */
addSetHead(&includeDirsSet, p2);
}
}
-
-#if 0
- if (options.printSearchDirs) {
- printf("includedir:\n");
- fputStrSet(stdout, includeDirsSet);
- }
-#endif
}
/* Set system lib path */
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 */
addSet(&dataDirsSet, Safe_strdup(DATADIR));
#endif
-#if 0
- if (options.printSearchDirs) {
- printf("datadir:\n");
- fputStrSet(stdout, dataDirsSet);
- }
-#endif
-
setIncludePath();
setLibPath();
}
/* 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);
options.stack10bit=0;
}
#endif
+
parseCmdLine (argc, argv);
+ if (options.verbose && NULL != port->processor)
+ printf("Processor: %s\n", port->processor);
+
initValues ();
setBinPaths(argv[0]);
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 ().
!options.c1mode &&
(fullSrcFileName || peekSet(relFilesSet) != NULL))
{
+ if (options.verbose)
+ printf ("sdcc: Calling linker...\n");
+
if (port->linker.do_link)
port->linker.do_link ();
else