what you give them. Help stamp out software-hoarding!
-------------------------------------------------------------------------*/
+#ifdef _WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
#include <signal.h>
#include "common.h"
#include <ctype.h>
#include <unistd.h>
#endif
-//REMOVE ME!!!
-extern int yyparse ();
+/* 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 */
-size_t fullDstFileNameLen; /* size of previous string. */
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 */
- /* can be NULL while linking without compiling */
-/*
- * in following definitions fixed length arrays are very dangerous!
- * Sets should be used instead. See definition of asmOptions.
- */
-const char *preArgv[128]; /* pre-processor arguments */
+ /* can be NULL while linking without compiling */
int currRegBank = 0;
-int RegBankUsed[4]={1, 0, 0, 0}; /*JCF: Reg Bank 0 used by default*/
+int RegBankUsed[4] = {1, 0, 0, 0}; /*JCF: Reg Bank 0 used by default*/
struct optimize optimize;
struct options options;
int preProcOnly = 0;
int noAssemble = 0;
-set *asmOptions = NULL; /* set of assembler options */
-char *linkOptions[128];
-char *libFiles[128];
-int nlibFiles = 0;
-char *libPaths[128];
-int nlibPaths = 0;
-char *relFiles[128];
-int nrelFiles = 0;
+set *preArgvSet = NULL; /* pre-processor arguments */
+set *asmOptionsSet = NULL; /* set of assembler options */
+set *linkOptionsSet = NULL; /* set of linker options */
+set *libFilesSet = NULL;
+set *libPathsSet = NULL;
+set *relFilesSet = NULL;
+set *dataDirsSet = NULL; /* list of data search directories */
+set *includeDirsSet = NULL; /* list of include search directories */
+set *libDirsSet = NULL; /* list of lib search directories */
/* uncomment JAMIN_DS390 to always override and use ds390 port
for mcs51 work. This is temporary, for compatibility testing. */
int ds390_jammed = 0;
#endif
-// Globally accessible scratch buffer for file names.
+/* Globally accessible scratch buffer for file names. */
char scratchFileName[PATH_MAX];
char buffer[PATH_MAX * 2];
#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_PRINT_SEARCH_DIRS "--print-search-dirs"
+#define OPTION_MSVC_ERROR_STYLE "--vc"
+#define OPTION_USE_STDOUT "--use-stdout"
static const OPTION
optionsTable[] = {
{ 0, OPTION_LARGE_MODEL, NULL, "external data space is used" },
{ 0, OPTION_MEDIUM_MODEL, NULL, "not supported" },
{ 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, OPTION_NO_GCSE, NULL, "Disable the GCSE optimisation" },
{ 0, OPTION_NO_LABEL_OPT, NULL, "Disable label optimisation" },
{ 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,"<nnnn> 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"},
/* End of options */
+#if 0 /* 10jun03 !OPT_DISABLE_PIC16 */
+ { 0, "--no-movff", &options.no_movff, "disable generating MOVFF opcode in PIC16 port"},
+ { 0, "--gen-banksel", &options.gen_banksel, "enable the generation of banksel assembler directives in PIC16 port"},
+#endif
{ 0, NULL }
};
#if !OPT_DISABLE_PIC
&pic_port,
#endif
+#if !OPT_DISABLE_PIC16
+ &pic16_port,
+#endif
#if !OPT_DISABLE_TININative
&tininative_port,
#endif
#if !OPT_DISABLE_XA51
&xa51_port,
#endif
+#if !OPT_DISABLE_DS400
+ &ds400_port,
+#endif
};
#define NUM_PORTS (sizeof(_ports)/sizeof(_ports[0]))
#if !OPT_DISABLE_PIC
extern void picglue ();
#endif
+#if !OPT_DISABLE_PIC16
+extern void pic16glue();
+#endif
/** Sets the port to the one given by the command line option.
@param The name minus the option (eg 'mcs51')
}
argv++;
}
+
/* Use the first in the list */
- port = _ports[0];
+#if defined(DEFAULT_PORT)
+ /* VR - 13/5/2003 DEFAULT_PORT is defined in port.h */
+ port = &DEFAULT_PORT;
+#else
+ port = _ports[0];
+#endif
+
}
/* search through the command line options for the processor */
fprintf (stderr,
"SDCC : ");
- for (i = 0; i < NUM_PORTS; i++)
+ 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
#ifdef SDCC_SUB_VERSION_STR
"/" SDCC_SUB_VERSION_STR
#ifdef __CYGWIN__
" (CYGWIN)\n"
#elif defined __MINGW32__
- " (MINGW32) \n"
+ " (MINGW32)\n"
#elif defined __DJGPP__
- " (DJGPP) \n"
+ " (DJGPP)\n"
#elif defined(_MSC_VER)
- " (MSVC) \n"
+ " (MSVC)\n"
#elif defined(__BORLANDC__)
- " (BORLANDC) \n"
+ " (BORLANDC)\n"
#else
" (UNIX) \n"
#endif
exit (0);
}
-/*-----------------------------------------------------------------*/
-/* parseWithComma - separates string with comma */
-/*-----------------------------------------------------------------*/
-void
-parseWithComma (char **dest, char *src)
-{
- int i = 0;
-
- strtok (src, "\r\n \t");
- /* skip the initial white spaces */
- while (isspace (*src))
- src++;
- dest[i++] = src;
- while (*src)
- {
- if (*src == ',')
- {
- *src = '\0';
- src++;
- if (*src)
- dest[i++] = src;
- continue;
- }
- src++;
- }
-}
-
/*-----------------------------------------------------------------*/
/* setParseWithComma - separates string with comma to a set */
/*-----------------------------------------------------------------*/
char *p;
/* skip the initial white spaces */
- while (isspace (*src))
+ while (isspace(*src))
src++;
- if ((p = strtok(src, ",")) != NULL) {
- do
- {
- addSet(dest, p);
- } while ((p = strtok(NULL, ",")) != NULL);
- }
+ for (p = strtok(src, ","); p != NULL; p = strtok(NULL, ","))
+ addSet(dest, Safe_strdup(p));
}
/*-----------------------------------------------------------------*/
/* setDefaultOptions - sets the default options */
/*-----------------------------------------------------------------*/
static void
-setDefaultOptions ()
+setDefaultOptions (void)
{
- int i;
-
- for (i = 0; i < 128; i++)
- preArgv[i] = linkOptions[i] = relFiles[i] = libFiles[i] = libPaths[i] = NULL;
-
/* first the options part */
options.stack_loc = 0; /* stack pointer initialised to 0 */
options.xstack_loc = 0; /* xternal stack starts at 0 */
strcmp (fext, ".R") == 0 || strcmp (fext, ".REL") == 0 ||
strcmp (fext, port->linker.rel_ext) == 0)
{
- relFiles[nrelFiles++] = s;
+ addSet(&relFilesSet, Safe_strdup(s));
return;
}
/* if .lib or .LIB */
if (strcmp (fext, ".lib") == 0 || strcmp (fext, ".LIB") == 0)
{
- libFiles[nlibFiles++] = s;
+ addSet(&libFilesSet, Safe_strdup(s));
return;
}
static char *
getStringArg(const char *szStart, char **argv, int *pi, int argc)
{
- if (argv[*pi][strlen(szStart)])
+ if (argv[*pi][strlen(szStart)])
{
return &argv[*pi][strlen(szStart)];
}
- else
+ else
{
++(*pi);
- if (*pi >= argc)
+ if (*pi >= argc)
{
werror (E_ARGUMENT_MISSING, szStart);
/* Die here rather than checking for errors later. */
exit(-1);
}
- else
+ else
{
return argv[*pi];
}
}
/** Gets the integer argument to this option using the same rules as
- getStringArg.
+ getStringArg.
*/
static int
getIntArg(const char *szStart, char **argv, int *pi, int argc)
if (argv[*pi][1] == '-')
{
- // Long option.
+ /* Long option. */
longOpt = argv[*pi];
}
else
{
if (unsupportedOptTable[i].shortOpt == shortOpt ||
(longOpt && unsupportedOptTable[i].longOpt && !strcmp(unsupportedOptTable[i].longOpt, longOpt))) {
- // Found an unsupported opt.
+ /* Found an unsupported opt. */
char buffer[100];
SNPRINTF(buffer, sizeof(buffer),
"%s%c%c",
return 1;
}
}
- // Didn't find in the table
+ /* Didn't find in the table */
return 0;
}
else
{
- // Not an option, so can't be unsupported :)
+ /* Not an option, so can't be unsupported :) */
return 0;
}
}
strcmp(optionsTable[i].longOpt, longOpt) == 0))
{
- // If it is a flag then we can handle it here
+ /* If it is a flag then we can handle it here */
if (optionsTable[i].pparameter != NULL)
{
if (optionsTable[i].shortOpt == shortOpt)
return 1;
}
else {
- // Not a flag. Handled manually later.
+ /* Not a flag. Handled manually later. */
return 0;
}
}
}
- // Didn't find in the table
+ /* Didn't find in the table */
return 0;
}
if (argv[*pi][1] == '-')
{
- // Long option.
+ /* Long option. */
longOpt = argv[*pi];
}
else
}
else
{
- // Not an option, so can't be handled.
+ /* Not an option, so can't be handled. */
return 0;
}
}
if (strcmp (argv[i], OPTION_LIB_PATH) == 0)
{
- libPaths[nlibPaths++] = getStringArg(OPTION_LIB_PATH, argv, &i, argc);
+ addSet(&libPathsSet, Safe_strdup(getStringArg(OPTION_LIB_PATH, argv, &i, argc)));
continue;
}
if (strcmp (argv[i], OPTION_CALLEE_SAVES) == 0)
{
- parseWithComma (options.calleeSaves, getStringArg(OPTION_CALLEE_SAVES, argv, &i, argc));
+ setParseWithComma(&options.calleeSavesSet, getStringArg(OPTION_CALLEE_SAVES, argv, &i, argc));
continue;
}
break;
case 'L':
- libPaths[nlibPaths++] = getStringArg("-L", argv, &i, argc);
+ addSet(&libPathsSet, Safe_strdup(getStringArg("-L", argv, &i, argc)));
break;
case 'l':
- libFiles[nlibFiles++] = getStringArg("-l", argv, &i, argc);
+ addSet(&libFilesSet, Safe_strdup(getStringArg("-l", argv, &i, argc)));
break;
case 'o':
else
{
fullDstFileName = Safe_strdup (buffer);
- fullDstFileNameLen = strlen(fullDstFileName) + 1;
/* get rid of the "."-extension */
/* pre-processer options */
if (argv[i][2] == 'p')
{
- parseWithComma ((char **)preArgv, getStringArg("-Wp", argv, &i, argc));
+ setParseWithComma(&preArgvSet, getStringArg("-Wp", argv, &i, argc));
}
/* linker options */
else if (argv[i][2] == 'l')
{
- parseWithComma(linkOptions, getStringArg("-Wl", argv, &i, argc));
+ setParseWithComma(&linkOptionsSet, getStringArg("-Wl", argv, &i, argc));
}
/* assembler options */
else if (argv[i][2] == 'a')
{
- setParseWithComma (&asmOptions, getStringArg("-Wa", argv, &i, argc));
+ setParseWithComma(&asmOptionsSet, getStringArg("-Wa", argv, &i, argc));
}
else
{
case 'M':
{
preProcOnly = 1;
- addToList (preArgv, "-M");
+ addSet(&preArgvSet, Safe_strdup("-M"));
break;
}
case 'C':
{
- addToList (preArgv, "-C");
+ addSet(&preArgvSet, Safe_strdup("-C"));
break;
}
SNPRINTF (buffer, sizeof(buffer),
((sOpt == 'I') ? "-%c\"%s\"": "-%c%s"), sOpt, rest);
- addToList (preArgv, buffer);
+ addSet(&preArgvSet, Safe_strdup(buffer));
}
break;
/* some sanity checks in c1 mode */
if (options.c1mode)
{
- int i;
+ const char *s;
if (fullSrcFileName)
{
werror (W_NO_FILE_ARG_IN_C1, fullSrcFileName);
}
fullSrcFileName = NULL;
- for (i = 0; i < nrelFiles; ++i)
+ for (s = setFirstItem(relFilesSet); s != NULL; s = setNextItem(relFilesSet))
{
- werror (W_NO_FILE_ARG_IN_C1, relFiles[i]);
+ werror (W_NO_FILE_ARG_IN_C1, s);
}
- for (i = 0; i < nlibFiles; ++i)
+ for (s = setFirstItem(libFilesSet); s != NULL; s = setNextItem(libFilesSet))
{
- werror (W_NO_FILE_ARG_IN_C1, libFiles[i]);
+ werror (W_NO_FILE_ARG_IN_C1, s);
}
- nrelFiles = nlibFiles = 0;
- if (options.cc_only || noAssemble || preProcOnly)
+ deleteSet(&relFilesSet);
+ deleteSet(&libFilesSet);
+
+ if (options.cc_only || noAssemble || preProcOnly)
{
werror (W_ILLEGAL_OPT_COMBINATION);
}
/* if no dstFileName given with -o, we've to find one: */
if (!dstFileName)
{
+ const char *s;
+
/* use the modulename from the C-source */
if (fullSrcFileName)
{
strncatz (dstFileName, moduleName, bufSize);
}
/* use the modulename from the first object file */
- else if (nrelFiles >= 1)
+ else if ((s = peekSet(relFilesSet)) != NULL)
{
char *objectName;
size_t bufSize;
- strncpyz (buffer, relFiles[0], sizeof(buffer));
+ strncpyz (buffer, s, sizeof(buffer));
/* remove extension (it must be .rel) */
*strrchr (buffer, '.') = '\0';
/* remove path */
/* if debug option is set then open the cdbFile */
if (options.debug && fullSrcFileName)
{
- SNPRINTF (scratchFileName, sizeof(scratchFileName),
- "%s.adb", dstFileName); //JCF: Nov 30, 2002
+ SNPRINTF (scratchFileName, sizeof(scratchFileName),
+ "%s.adb", dstFileName); /*JCF: Nov 30, 2002*/
if(debugFile->openFile(scratchFileName))
debugFile->writeModule(moduleName);
else
werror (E_FILE_OPEN_ERR, scratchFileName);
}
+ MSVC_style(options.vc_err_style);
+ if(options.use_stdout) dup2(STDOUT_FILENO, STDERR_FILENO);
+
return 0;
}
{
FILE *lnkfile;
char *segName, *c;
- int i, system_ret;
+ int system_ret;
+ const char *s;
/* first we need to create the <filename>.lnk file */
- SNPRINTF (scratchFileName, sizeof(scratchFileName),
+ SNPRINTF (scratchFileName, sizeof(scratchFileName),
"%s.lnk", dstFileName);
if (!(lnkfile = fopen (scratchFileName, "w")))
{
if ( (options.stack_loc) && (options.stack_loc<0x100) ) {
WRITE_SEG_LOC ("SSEG", options.stack_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 */
- for (i = 0; linkOptions[i]; i++)
- fprintf (lnkfile, "%s\n", linkOptions[i]);
+ fputStrSet(lnkfile, linkOptionsSet);
/* other library paths if specified */
- for (i = 0; i < nlibPaths; i++)
- fprintf (lnkfile, "-k %s\n", libPaths[i]);
+ for (s = setFirstItem(libPathsSet); s != NULL; s = setNextItem(libPathsSet))
+ fprintf (lnkfile, "-k %s\n", s);
/* standard library path */
if (!options.nostdlib)
break;
case MODEL_FLAT24:
/* c = "flat24"; */
- c = "ds390";
+ if (TARGET_IS_DS390)
+ {
+ c = "ds390";
+ }
+ else if (TARGET_IS_DS400)
+ {
+ c = "ds400";
+ }
+ else
+ {
+ fprintf(stderr,
+ "Add support for your FLAT24 target in %s @ line %d\n",
+ __FILE__, __LINE__);
+ exit(-1);
+ }
break;
case MODEL_PAGE0:
c = "xa51";
c = "unknown";
break;
}
- mfprintf (lnkfile, getRuntimeVariables(), "-k {libdir}{sep}%s\n", c);
+ for (s = setFirstItem(libDirsSet); s != NULL; s = setNextItem(libDirsSet))
+ mfprintf (lnkfile, getRuntimeVariables(), "-k %s{sep}%s\n", s, c);
/* standard library files */
#if !OPT_DISABLE_DS390
if (options.model == MODEL_FLAT24)
{
- fprintf (lnkfile, "-l %s\n", STD_DS390_LIB);
+ 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);
+ }
}
#endif
}
/* additional libraries if any */
- for (i = 0; i < nlibFiles; i++)
- fprintf (lnkfile, "-l %s\n", libFiles[i]);
+ for (s = setFirstItem(libFilesSet); s != NULL; s = setNextItem(libFilesSet))
+ fprintf (lnkfile, "-l %s\n", s);
/* put in the object files */
if (fullSrcFileName)
- fprintf (lnkfile, "%s ", dstFileName);
+ fprintf (lnkfile, "%s%s\n", dstFileName, port->linker.rel_ext);
- for (i = 0; i < nrelFiles; i++)
- fprintf (lnkfile, "%s\n", relFiles[i]);
+ fputStrSet(lnkfile, relFilesSet);
fprintf (lnkfile, "\n-e\n");
fclose (lnkfile);
}
else
{
- strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName));
+ s = peekSet(relFilesSet);
+
+ assert(s);
+
+ strncpyz (scratchFileName, s, sizeof(scratchFileName));
/* strip ".rel" extension */
*strrchr (scratchFileName, '.') = '\0';
}
if (port->linker.cmd)
{
char buffer2[PATH_MAX];
- buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, NULL);
- buildCmdLine2 (buffer, buffer2, sizeof(buffer));
+
+ /* VR 030517 - gplink needs linker options to set the linker script,*/
+ buildCmdLine (buffer2, port->linker.cmd, dstFileName, scratchFileName, NULL, linkOptionsSet);
+
+ buildCmdLine2 (buffer, sizeof(buffer), buffer2);
}
else
{
- buildCmdLine2 (buffer, port->linker.mcmd, sizeof(buffer));
+ buildCmdLine2 (buffer, sizeof(buffer), port->linker.mcmd);
}
+/* 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? */
}
else
{
- strncpyz (scratchFileName, relFiles[0], sizeof(scratchFileName));
- /* strip "rel" extension */
+ s = peekSet(relFilesSet);
+
+ assert(s);
+
+ strncpyz (scratchFileName, s, sizeof(scratchFileName));
+ /* strip ".rel" extension */
p = strrchr (scratchFileName, '.');
if (p)
{
- p++;
- *p = 0;
+ *p = 0;
}
-
}
strncatz (scratchFileName,
- options.out_fmt ? "S19" : "ihx",
+ options.out_fmt ? ".S19" : ".ihx",
sizeof(scratchFileName));
rename (scratchFileName, fullDstFileName);
- q = strrchr (fullDstFileName, '.');
- if (q)
- {
- /* point after the '.' of the extension */
- q++;
- }
- else
+ strncpyz (buffer, fullDstFileName, sizeof(buffer));
+ q = strrchr (buffer, '.');
+ if (!q)
{
/* no extension: append new extensions */
- /* Don't we want to append a period here ? */
- q = strlen (fullDstFileName) + fullDstFileName;
+ q = strlen (buffer) + buffer;
}
-
- *p = 0;
- strncatz (scratchFileName, "map", sizeof(scratchFileName));
+
+ *p = 0;
+ strncatz (scratchFileName, ".map", sizeof(scratchFileName));
*q = 0;
- strncatz(fullDstFileName, "map", fullDstFileNameLen);
- rename (scratchFileName, fullDstFileName);
- *p = 0;
- strncatz (scratchFileName, "mem", sizeof(scratchFileName));
+ strncatz(buffer, ".map", sizeof(buffer));
+ rename (scratchFileName, buffer);
+ *p = 0;
+ strncatz (scratchFileName, ".mem", sizeof(scratchFileName));
*q = 0;
- strncatz(fullDstFileName, "mem", fullDstFileNameLen);
- rename (scratchFileName, fullDstFileName);
+ strncatz(buffer, ".mem", sizeof(buffer));
+ rename (scratchFileName, buffer);
}
if (system_ret)
{
}
if (port->assembler.do_assemble) {
- port->assembler.do_assemble(asmOptions);
+ 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,
- asmOptions);
+ asmOptionsSet);
} else {
- buildCmdLine2 (buffer, port->assembler.mcmd, sizeof(buffer));
+ buildCmdLine2 (buffer, sizeof(buffer), port->assembler.mcmd);
}
if (my_system (buffer)) {
}
else
{
+ const char *s;
+ set *inclList = NULL;
+
/* if using external stack define the macro */
if (options.useXstack)
- addToList (preArgv, "-DSDCC_USE_XSTACK");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_USE_XSTACK"));
/* set the macro for stack autos */
if (options.stackAuto)
- addToList (preArgv, "-DSDCC_STACK_AUTO");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_STACK_AUTO"));
/* set the macro for stack autos */
if (options.stack10bit)
- addToList (preArgv, "-DSDCC_STACK_TENBIT");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_STACK_TENBIT"));
/* set the macro for no overlay */
if (options.noOverlay)
- addToList (preArgv, "-DSDCC_NOOVERLAY");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_NOOVERLAY"));
/* set the macro for large model */
switch (options.model)
{
case MODEL_LARGE:
- addToList (preArgv, "-DSDCC_MODEL_LARGE");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_LARGE"));
break;
case MODEL_SMALL:
- addToList (preArgv, "-DSDCC_MODEL_SMALL");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_SMALL"));
break;
case MODEL_COMPACT:
- addToList (preArgv, "-DSDCC_MODEL_COMPACT");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_COMPACT"));
break;
case MODEL_MEDIUM:
- addToList (preArgv, "-DSDCC_MODEL_MEDIUM");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_MEDIUM"));
break;
case MODEL_FLAT24:
- addToList (preArgv, "-DSDCC_MODEL_FLAT24");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_FLAT24"));
break;
case MODEL_PAGE0:
- addToList (preArgv, "-DSDCC_MODEL_PAGE0");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_MODEL_PAGE0"));
break;
default:
werror (W_UNKNOWN_MODEL, __FILE__, __LINE__);
}
/* add port (processor information to processor */
- addToList (preArgv, "-DSDCC_{port}");
- addToList (preArgv, "-D__{port}");
+ addSet(&preArgvSet, Safe_strdup("-DSDCC_{port}"));
+ addSet(&preArgvSet, Safe_strdup("-D__{port}"));
/* standard include path */
if (!options.nostdinc) {
- addToList (preArgv, "-I\"{includedir}\"");
+ inclList = appendStrSet(includeDirsSet, "-I\"", "\"");
+ mergeSets(&preArgvSet, inclList);
}
- setMainValue ("cppextraopts", join(preArgv));
+ setMainValue("cppextraopts", (s = joinStrSet(preArgvSet)));
+ Safe_free((void *)s);
+ if (inclList != NULL)
+ deleteSet(&inclList);
if (preProcOnly && fullDstFileName)
{
if (options.verbose)
printf ("sdcc: Calling preprocessor...\n");
- buildCmdLine2 (buffer, _preCmd, sizeof(buffer));
+ buildCmdLine2 (buffer, sizeof(buffer), _preCmd);
if (preProcOnly) {
if (my_system (buffer)) {
*/
/* do it in reverse mode, so that addSetHead() can be used
- instaed of slower addSet() */
+ instead of slower addSet() */
if ((p = getBinPath(argv0)) != NULL)
addSetHead(&binPathSet, Safe_strdup(p));
SNPRINTF(buf, sizeof buf, "%s" PREFIX2BIN_DIR, p);
addSetHead(&binPathSet, Safe_strdup(buf));
}
+
+ if (options.printSearchDirs) {
+ printf("programs:\n");
+ fputStrSet(stdout, binPathSet);
+ }
}
/* Set system include path */
static void
-setIncludePath(const char *datadir)
+setIncludePath(void)
{
char *p;
- char buf[PATH_MAX];
/*
* Search logic:
* 4. - DATADIR/INCLUDE_DIR_SUFFIX (only on *nix)
*/
- if ((p = getenv(SDCC_INCLUDE_NAME)) == NULL) {
- SNPRINTF(buf, sizeof buf, "%s" INCLUDE_DIR_SUFFIX, datadir);
- p = buf;
- }
+ includeDirsSet = appendStrSet(dataDirsSet, NULL, INCLUDE_DIR_SUFFIX);
- setMainValue ("includedir", p);
+ if ((p = getenv(SDCC_INCLUDE_NAME)) != NULL)
+ addSetHead(&includeDirsSet, p);
+
+ if (options.printSearchDirs) {
+ printf("includedir:\n");
+ fputStrSet(stdout, includeDirsSet);
+ }
}
/* Set system lib path */
static void
-setLibPath(const char *datadir)
+setLibPath(void)
{
char *p;
- char buf[PATH_MAX];
/*
* Search logic:
* 4. - DATADIR/LIB_DIR_SUFFIX/<model> (only on *nix)
*/
- if ((p = getenv(SDCC_LIB_NAME)) == NULL) {
- SNPRINTF(buf, sizeof buf, "%s" LIB_DIR_SUFFIX, datadir);
- p = buf;
- }
+ libDirsSet = appendStrSet(dataDirsSet, NULL, LIB_DIR_SUFFIX);
+
+ if ((p = getenv(SDCC_LIB_NAME)) != NULL)
+ addSetHead(&libDirsSet, p);
- setMainValue ("libdir", p);
+ if (options.printSearchDirs) {
+ printf("libdir:\n");
+ fputStrSet(stdout, libDirsSet);
+ }
}
/* Set data path */
if ((p = getenv(SDCC_DIR_NAME)) != NULL) {
SNPRINTF(buf, sizeof buf, "%s" PREFIX2DATA_DIR, p);
- p = buf;
+ addSet(&dataDirsSet, Safe_strdup(buf));
}
- else {
- if ((p = getBinPath(argv0)) == NULL)
- p = ".";
+ if ((p = getBinPath(argv0)) != NULL) {
SNPRINTF(buf, sizeof buf, "%s" BIN2DATA_DIR, p);
- p = buf;
+ addSet(&dataDirsSet, Safe_strdup(buf));
+ }
-#ifndef _WIN32 /* *nix paltform */
- if (!pathExists(p))
- p = DATADIR; /* last resort */
-#endif
+#ifdef _WIN32
+ if (peekSet(dataDirsSet) == NULL) {
+ /* this should never happen... */
+ wassertl(0, "Can't get binary path");
}
+#else
+ addSet(&dataDirsSet, Safe_strdup(DATADIR));
+#endif
- setIncludePath(p);
- setLibPath(p);
+ if (options.printSearchDirs) {
+ printf("datadir:\n");
+ fputStrSet(stdout, dataDirsSet);
+ }
- setMainValue ("datadir", p);
+ setIncludePath();
+ setLibPath();
}
static void
if (port->init)
port->init ();
- // Create a default exe search path from the path to the sdcc command
-
-
setDefaultOptions ();
#ifdef JAMIN_DS390
if (ds390_jammed) {
#endif
parseCmdLine (argc, argv);
- /* if no input then printUsage & exit */
- if (!options.c1mode && !fullSrcFileName && !nrelFiles)
- {
- printUsage ();
- exit (0);
- }
-
initValues ();
setBinPaths(argv[0]);
setDataPaths(argv[0]);
+ /* if no input then printUsage & exit */
+ if (!options.c1mode && !fullSrcFileName && peekSet(relFilesSet) == NULL) {
+ if (!options.printSearchDirs)
+ printUsage();
+
+ exit(0);
+ }
+
/* initMem() is expensive, but
initMem() must called before port->finaliseOptions ().
And the z80 port needs port->finaliseOptions(),
#if !OPT_DISABLE_PIC
picglue ();
#endif
- }
- else {
+
+ } else
+ if(TARGET_IS_PIC16) {
+ /* PIC16 port misc improvements Vangelis Rokas - 6-May-2003
+ Generate .asm files for gpasm (just like PIC target) but use
+ pic16glue()
+ */
+
+#if !OPT_DISABLE_PIC16
+ pic16glue();
+#endif
+ } else {
glue ();
}
!fatalError &&
!noAssemble &&
!options.c1mode &&
- (fullSrcFileName || nrelFiles))
+ (fullSrcFileName || peekSet(relFilesSet) != NULL))
{
if (port->linker.do_link)
port->linker.do_link ();
projects / fw / sdcc / blobdiff