X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmain.c;h=754b8034802d816d3b6c28bf8514718d976a35dd;hb=24db07e65dc37c465c586f173fcf7d591d5bd7bc;hp=417dae3a35b88fdd9386718dab4804146ca30000;hpb=91fa3abd8ad108b7958a73bc5f374328777994e4;p=fw%2Fsdcc diff --git a/src/SDCCmain.c b/src/SDCCmain.c index 417dae3a..754b8034 100644 --- a/src/SDCCmain.c +++ b/src/SDCCmain.c @@ -22,6 +22,7 @@ what you give them. Help stamp out software-hoarding! -------------------------------------------------------------------------*/ +#include #include "common.h" #include #include "newalloc.h" @@ -34,8 +35,6 @@ #if NATIVE_WIN32 #include -#else -#include "spawn.h" #endif #if !defined(__BORLANDC__) && !defined(_MSC_VER) @@ -124,6 +123,8 @@ char DefaultExePath[128]; #define OPTION_SHORT_IS_8BITS "--short-is-8bits" #define OPTION_TINI_LIBID "--tini-libid" #define OPTION_NO_XINIT_OPT "--no-xinit-opt" +#define OPTION_XRAM_SIZE "--xram-size" +#define OPTION_CODE_SIZE "--code-size" static const OPTION optionsTable[] = { @@ -149,7 +150,6 @@ optionsTable[] = { { 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)" }, { 0, "--xstack", &options.useXstack, "Use external stack" }, - { 0, "--generic", &options.genericPtr, "All unqualified ptrs converted to '_generic'" }, { 0, OPTION_NO_GCSE, NULL, "Disable the GCSE optimisation" }, { 0, OPTION_NO_LOOP_INV, NULL, "Disable optimisation of invariants" }, { 0, OPTION_NO_LOOP_IND, NULL, NULL }, @@ -167,9 +167,11 @@ optionsTable[] = { { 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_XRAM_LOC, NULL, " External Ram start location" }, + { 0, OPTION_XRAM_SIZE, NULL, " External Ram size" }, { 0, OPTION_IRAM_SIZE, NULL, " Internal Ram size" }, { 0, OPTION_XSTACK_LOC, NULL, " External Ram start location" }, { 0, OPTION_CODE_LOC, NULL, " Code Segment Location" }, + { 0, OPTION_CODE_SIZE, NULL, " Code Segment size" }, { 0, OPTION_STACK_LOC, NULL, " Stack pointer initial value" }, { 0, OPTION_DATA_LOC, NULL, " Direct data start location" }, { 0, OPTION_IDATA_LOC, NULL, NULL }, @@ -188,7 +190,6 @@ optionsTable[] = { { 0, "--peep-asm", &options.asmpeep, NULL }, { 0, "--debug", &options.debug, "Enable debugging symbol output" }, { 'v', OPTION_VERSION, NULL, "Display sdcc's version" }, - { 0, "--stack-after-data", &options.stackOnData, "initialize the stackpointer with the last byte use in DSEG" }, { 'E', "--preprocessonly", &preProcOnly, "Preprocess only, do not compile" }, { 0, "--c1mode", &options.c1mode, "Act in c1 mode. The input is preprocessed code, the output is assembly code." }, { 0, "--help", NULL, "Display this help" }, @@ -226,8 +227,6 @@ typedef struct { static const UNSUPPORTEDOPT unsupportedOptTable[] = { - { 'a', NULL, "use --stack-auto instead." }, - { 'g', NULL, "use --generic instead" }, { 'X', NULL, "use --xstack-loc instead" }, { 'x', NULL, "use --xstack instead" }, { 'i', NULL, "use --idata-loc instead" }, @@ -246,7 +245,7 @@ static const char *_baseValues[] = { NULL }; -static const char *_preCmd = "{cpp} -nostdinc -Wall -lang-c++ -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}"; +static const char *_preCmd = "{cpp} -nostdinc -Wall -std=c99 -DSDCC=1 {cppextraopts} {fullsrcfilename} {cppoutfilename}"; PORT *port; @@ -387,16 +386,18 @@ printVersionInfo () " (" __DATE__ ")" #ifdef __CYGWIN__ " (CYGWIN)\n" +#elif defined __MINGW32__ + " (MINGW32) \n" #else -#ifdef __DJGPP__ +# ifdef __DJGPP__ " (DJGPP) \n" -#else -#if defined(_MSC_VER) +# else +# if defined(_MSC_VER) " (WIN32) \n" -#else +# else " (UNIX) \n" -#endif -#endif +# endif +# endif #endif ,VersionString @@ -492,7 +493,6 @@ setDefaultOptions () options.data_loc = 0; /* JCF: By default let the linker locate data */ options.xdata_loc = 0; options.idata_loc = 0x80; - options.genericPtr = 1; /* default on */ options.nopeep = 0; options.model = port->general.default_model; options.nostdlib = 0; @@ -549,7 +549,8 @@ processFile (char *s) } /* the only source file */ - if (!(srcFile = fopen ((fullSrcFileName = s), "r"))) + fullSrcFileName = s; + if (!(srcFile = fopen (fullSrcFileName, "r"))) { werror (E_FILE_OPEN_ERR, s); exit (1); @@ -614,24 +615,6 @@ processFile (char *s) } -static void -_processC1Arg (char *s) -{ - if (fullSrcFileName) - { - if (options.out_name) - { - werror (W_TOO_MANY_SRC, s); - return; - } - options.out_name = Safe_strdup (s); - } - else - { - processFile (s); - } -} - static void _setModel (int model, const char *sz) { @@ -925,6 +908,19 @@ parseCmdLine (int argc, char **argv) continue; } + if (strcmp (argv[i], OPTION_XRAM_SIZE) == 0) + { + options.xram_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); + options.xram_size_set = TRUE; + continue; + } + + if (strcmp (argv[i], OPTION_CODE_SIZE) == 0) + { + options.code_size = getIntArg(OPTION_IRAM_SIZE, argv, &i, argc); + continue; + } + if (strcmp (argv[i], OPTION_DATA_LOC) == 0) { options.data_loc = getIntArg(OPTION_DATA_LOC, argv, &i, argc); @@ -1118,13 +1114,13 @@ parseCmdLine (int argc, char **argv) if (argv[i][2] == ' ' || argv[i][2] == '\0') { i++; - if (i >= argc) + if (i >= argc) { /* No argument. */ werror(E_ARGUMENT_MISSING, argv[i-1]); break; } - else + else { rest = argv[i]; } @@ -1150,10 +1146,7 @@ parseCmdLine (int argc, char **argv) if (!port->parseOption (&argc, argv, &i)) { /* no option must be a filename */ - if (options.c1mode) - _processC1Arg (argv[i]); - else - processFile (argv[i]); + processFile (argv[i]); } } @@ -1219,7 +1212,7 @@ linkEdit (char **envp) { FILE *lnkfile; char *segName, *c; - int i; + int i, system_ret; /* first we need to create the .lnk file */ sprintf (scratchFileName, "%s.lnk", dstFileName); @@ -1236,6 +1229,14 @@ linkEdit (char **envp) if (options.iram_size) fprintf (lnkfile, "-a 0x%04x\n", options.iram_size); + /* if xram size specified */ + if (options.xram_size_set) + fprintf (lnkfile, "-v 0x%04x\n", options.xram_size); + + /* if code size specified */ + if (options.code_size) + fprintf (lnkfile, "-w 0x%04x\n", options.code_size); + if (options.debug) fprintf (lnkfile, "-z\n"); @@ -1265,8 +1266,8 @@ linkEdit (char **envp) WRITE_SEG_LOC (BIT_NAME, 0); /* JCF: stack start */ - if(options.stack_loc) { - WRITE_SEG_LOC ("SSEG", options.stack_loc & 0xff); + if ( (options.stack_loc) && (options.stack_loc<0x100) ) { + WRITE_SEG_LOC ("SSEG", options.stack_loc); } /* add the extra linker options */ @@ -1375,28 +1376,49 @@ linkEdit (char **envp) buildCmdLine2 (buffer, port->linker.mcmd); } - if (my_system (buffer)) - { - exit (1); - } + system_ret = my_system (buffer); /* TODO: most linker don't have a -o parameter */ /* -o option overrides default name? */ if (fullDstFileName) { + char *p, *q; /* the linked file gets the name of the first modul */ if (fullSrcFileName) - { + { strcpy (scratchFileName, dstFileName); + p = strlen (scratchFileName) + scratchFileName; } else { strcpy (scratchFileName, relFiles[0]); - /* strip ".rel" extension */ - *strrchr (scratchFileName, '.') = '\0'; + /* strip "rel" extension */ + p = strrchr (scratchFileName, '.') + 1; } - strcat (scratchFileName, options.out_fmt ? ".S19" : ".ihx"); + strcpy (p, options.out_fmt ? "S19" : "ihx"); + rename (scratchFileName, fullDstFileName); + + q = strrchr (fullDstFileName, '.'); + if (q) + { + /* point after the '.' of the extension */ + q++; + } + else + { + /* no extension: append new extensions */ + q = strlen (fullDstFileName) + fullDstFileName; + } + strcpy (p, "map"); + strcpy (q, "map"); + rename (scratchFileName, fullDstFileName); + strcpy (p, "mem"); + strcpy (q, "mem"); rename (scratchFileName, fullDstFileName); } + if (system_ret) + { + exit (1); + } } /*-----------------------------------------------------------------*/ @@ -1504,7 +1526,7 @@ preProcess (char **envp) } setMainValue ("cppextraopts", join(preArgv)); - + if (preProcOnly) { if (fullDstFileName) @@ -1714,6 +1736,33 @@ initValues (void) } +static void +sig_handler (int signal) +{ + char *sig_string; + + switch (signal) + { + case SIGABRT: + sig_string = "SIGABRT"; + break; + case SIGTERM: + sig_string = "SIGTERM"; + break; + case SIGINT: + sig_string = "SIGINT"; + break; + case SIGSEGV: + sig_string = "SIGSEGV"; + break; + default: + sig_string = "Unknown?"; + break; + } + fprintf (stderr, "Catched signal %d: %s\n", signal, sig_string); + exit (1); +} + /* * main routine * initialises and calls the parser @@ -1735,7 +1784,14 @@ main (int argc, char **argv, char **envp) /* install atexit handler */ atexit(rm_tmpfiles); - /* Before parsing the command line options, do a + /* install signal handler; + it's only purpuse is to call exit() to remove temp files */ + signal (SIGABRT, sig_handler); + signal (SIGTERM, sig_handler); + signal (SIGINT , sig_handler); + signal (SIGSEGV, sig_handler); + + /* Before parsing the command line options, do a * search for the port and processor and initialize * them if they're found. (We can't gurantee that these * will be the first options specified). @@ -1771,7 +1827,7 @@ main (int argc, char **argv, char **envp) /* if no input then printUsage & exit */ if ((!options.c1mode && !fullSrcFileName && !nrelFiles) || - (options.c1mode && !fullSrcFileName && !options.out_name)) + (options.c1mode && !fullSrcFileName)) { printUsage (); exit (0);