#include "SDCCdebug.h"
#include "SDCCargs.h"
-#if NATIVE_WIN32
+#ifdef _WIN32
#include <process.h>
-#endif
-
-#if !defined(__BORLANDC__) && !defined(_MSC_VER)
+#else
#include <sys/stat.h>
#include <unistd.h>
#endif
/* "" 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 */
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;
-char *VersionString = SDCC_VERSION_STR;
int preProcOnly = 0;
int noAssemble = 0;
+set *asmOptions = NULL; /* set of assembler options */
char *linkOptions[128];
-const char *asmOptions[128];
char *libFiles[128];
int nlibFiles = 0;
char *libPaths[128];
char scratchFileName[PATH_MAX];
char buffer[PATH_MAX * 2];
-// In MSC VC6 default search path for exe's to path for this
-
-char DefaultExePath[128];
-
#define OPTION_HELP "-help"
#define LENGTH(_a) (sizeof(_a)/sizeof(*(_a)))
#define OPTION_NO_LABEL_OPT "--nolabelopt"
#define OPTION_NO_LOOP_INV "--noinvariant"
#define OPTION_NO_LOOP_IND "--noinduction"
-#define OPTION_LESS_PEDANTIC "--lesspedantic"
+#define OPTION_LESS_PEDANTIC "--less-pedantic"
#define OPTION_NO_GCSE "--nogcse"
#define OPTION_SHORT_IS_8BITS "--short-is-8bits"
#define OPTION_TINI_LIBID "--tini-libid"
/** List of all default constant macros.
*/
static const char *_baseValues[] = {
- "cpp", "{bindir}{sep}sdcpp",
+ "cpp", "sdcpp",
"cppextraopts", "",
/* Path seperator character */
"sep", DIR_SEPARATOR_STRING,
for (i = 0; i < NUM_PORTS; i++)
fprintf (stderr, "%s%s", i == 0 ? "" : "/", _ports[i]->target);
- fprintf (stderr, " %s"
+ fprintf (stderr, " " SDCC_VERSION_STR
#ifdef SDCC_SUB_VERSION_STR
"/" SDCC_SUB_VERSION_STR
#endif
#else
" (UNIX) \n"
#endif
-
- ,VersionString
);
}
}
}
+/*-----------------------------------------------------------------*/
+/* setParseWithComma - separates string with comma to a set */
+/*-----------------------------------------------------------------*/
+void
+setParseWithComma (set **dest, char *src)
+{
+ char *p;
+
+ /* skip the initial white spaces */
+ while (isspace (*src))
+ src++;
+
+ if ((p = strtok(src, ",")) != NULL) {
+ do
+ {
+ addSet(dest, p);
+ } while ((p = strtok(NULL, ",")) != NULL);
+ }
+}
+
/*-----------------------------------------------------------------*/
/* setDefaultOptions - sets the default options */
/*-----------------------------------------------------------------*/
int i;
for (i = 0; i < 128; i++)
- preArgv[i] = asmOptions[i] =
- linkOptions[i] = relFiles[i] = libFiles[i] =
- libPaths[i] = NULL;
+ preArgv[i] = linkOptions[i] = relFiles[i] = libFiles[i] = libPaths[i] = NULL;
/* first the options part */
options.stack_loc = 0; /* stack pointer initialised to 0 */
/* assembler options */
else if (argv[i][2] == 'a')
{
- parseWithComma ((char **) asmOptions, getStringArg("-Wa", argv, &i, argc));
+ setParseWithComma (&asmOptions, getStringArg("-Wa", argv, &i, argc));
}
else
{
}
else
{
- /* Have to set cppoutfilename to something, even if piping */
- setMainValue ("cppoutfilename", "");
+ /* Piping: set cppoutfilename to NULL, to avoid empty quotes */
+ setMainValue ("cppoutfilename", NULL);
}
if (options.verbose)
strncpyz (scratchFileName, argv0, sizeof(scratchFileName));
*strrchr (scratchFileName, DIR_SEPARATOR_CHAR) = '\0';
setMainValue ("bindir", scratchFileName);
- ExePathList[0] = Safe_strdup (scratchFileName);
+ addSet(&binPathSet, Safe_strdup (scratchFileName));
}
else if (getenv (SDCCDIR_NAME) != NULL)
{
strncpyz (scratchFileName, getenv (SDCCDIR_NAME), sizeof(scratchFileName));
strncatz (scratchFileName, buffer, sizeof(scratchFileName));
setMainValue ("bindir", scratchFileName);
- ExePathList[0] = Safe_strdup (scratchFileName);
+ addSet(&binPathSet, Safe_strdup (scratchFileName));
}
else
{
setMainValue ("bindir", BINDIR);
- ExePathList[0] = BINDIR;
+ addSet(&binPathSet, BINDIR);
}
do