X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCglue.c;h=55487f379a1f6eb8939a46db25137c7f9423230a;hb=c923162f3666b264b8422d8d73e5b2edc28e8fec;hp=6552a80f46717ba5ced20e57058940ed14b0bc9c;hpb=9388b031d56edbb7a48626d6fb573d3a411f61fd;p=fw%2Fsdcc diff --git a/src/SDCCglue.c b/src/SDCCglue.c index 6552a80f..55487f37 100644 --- a/src/SDCCglue.c +++ b/src/SDCCglue.c @@ -28,17 +28,7 @@ #include "newalloc.h" #if !defined(__BORLANDC__) && !defined(_MSC_VER) -#if 0 /* This should no longer be necessary. */ -// This is a bit messy because we define link ourself -#define link NoLiNk #include -#undef link -#else - -#include -#endif -#else -// No unistd.h in Borland C++ #endif symbol *interrupts[256]; @@ -80,7 +70,7 @@ DEFSETFUNC (rmTmpFiles) if (name) { unlink (name); - free (name); + Safe_free (name); } return 0; } @@ -109,6 +99,11 @@ aopLiteralLong (value * val, int offset, int size) } fl; + if (!val) { + // assuming we have been warned before + val=constVal("0"); + } + /* if it is a float then it gets tricky */ /* otherwise it is fairly simple */ if (!IS_FLOAT (val->type)) { @@ -159,8 +154,9 @@ aopLiteral (value * val, int offset) static void emitRegularMap (memmap * map, bool addPublics, bool arFlag) { - symbol *sym; + symbol *sym, *symIval; ast *ival = NULL; + memmap *segment; if (addPublics) { @@ -190,18 +186,25 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag) /* if allocation required check is needed then check if the symbol really requires allocation only for local variables */ + if (arFlag && !IS_AGGREGATE (sym->type) && !(sym->_isparm && !IS_REGPARM (sym->etype)) && !sym->allocreq && sym->level) continue; + /* for bitvar locals and parameters */ + if (!arFlag && !sym->allocreq && sym->level + && !SPEC_ABSA (sym->etype)) { + continue; + } + /* if global variable & not static or extern and addPublics allowed then add it to the public set */ if ((sym->level == 0 || (sym->_isparm && !IS_REGPARM (sym->etype))) && addPublics && !IS_STATIC (sym->etype) && - (sym->used || sym->fbody)) + (IS_FUNC(sym->type) ? (sym->used || IFFUNC_HASBODY(sym->type)) : 1)) { addSetHead (&publics, sym); } @@ -212,29 +215,26 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag) continue; /* print extra debug info if required */ - if ((options.debug || sym->level == 0) && !options.nodebug) - { - - cdbSymbol (sym, cdbFile, FALSE, FALSE); - - if (!sym->level) /* global */ - if (IS_STATIC (sym->etype)) - fprintf (map->oFile, "F%s$", moduleName); /* scope is file */ - else - fprintf (map->oFile, "G$"); /* scope is global */ + if (options.debug) { + cdbSymbol (sym, cdbFile, FALSE, FALSE); + if (!sym->level) /* global */ + if (IS_STATIC (sym->etype)) + fprintf (map->oFile, "F%s$", moduleName); /* scope is file */ else - /* symbol is local */ - fprintf (map->oFile, "L%s$", (sym->localof ? sym->localof->name : "-null-")); - fprintf (map->oFile, "%s$%d$%d", sym->name, sym->level, sym->block); - } - + fprintf (map->oFile, "G$"); /* scope is global */ + else + /* symbol is local */ + fprintf (map->oFile, "L%s$", (sym->localof ? sym->localof->name : "-null-")); + fprintf (map->oFile, "%s$%d$%d", sym->name, sym->level, sym->block); + } + /* if is has an absolute address then generate an equate for this no need to allocate space */ if (SPEC_ABSA (sym->etype)) { - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) { fprintf (map->oFile, " == 0x%04x\n", SPEC_ADDR (sym->etype)); - + } fprintf (map->oFile, "%s\t=\t0x%04x\n", sym->rname, SPEC_ADDR (sym->etype)); @@ -242,33 +242,46 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag) else { /* allocate space */ - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) { fprintf (map->oFile, "==.\n"); + } if (IS_STATIC (sym->etype)) tfprintf (map->oFile, "!slabeldef\n", sym->rname); else tfprintf (map->oFile, "!labeldef\n", sym->rname); - tfprintf (map->oFile, "\t!ds\n", (unsigned int) getSize (sym->type) & 0xffff); + tfprintf (map->oFile, "\t!ds\n", + (unsigned int) getSize (sym->type) & 0xffff); } /* if it has an initial value then do it only if it is a global variable */ if (sym->ival && sym->level == 0) { - - if (IS_AGGREGATE (sym->type)) + if (IS_AGGREGATE (sym->type)) { ival = initAggregates (sym, sym->ival, NULL); - else + } else { ival = newNode ('=', newAst_VALUE (symbolVal (sym)), decorateType (resolveSymbols (list2expr (sym->ival)))); + } codeOutFile = statsg->oFile; allocInfo = 0; // set ival's lineno to where the symbol was defined - ival->lineno=sym->lineDef; - + if (ival) ival->lineno=sym->lineDef; eBBlockFromiCode (iCodeFromAst (ival)); allocInfo = 1; + + /* if the ival is a symbol assigned to an aggregate, + (bug #458099 -> #462479) + we don't need it anymore, so delete it from its segment */ + if (sym->ival->type == INIT_NODE && + IS_AST_SYM_VALUE(sym->ival->init.node) && + IS_AGGREGATE (sym->type) ) { + symIval=AST_SYMBOL(sym->ival->init.node); + segment = SPEC_OCLS (symIval->etype); + deleteSetItem (&segment->syms, symIval); + } + sym->ival = NULL; } } @@ -377,7 +390,7 @@ initPointer (initList * ilist) return val; } wrong: - werror (E_INIT_WRONG); + werror (W_INIT_WRONG); return NULL; } @@ -470,7 +483,8 @@ pointerTypeToGPByte (const int p_type, const char *iname, const char *oname) void _printPointerType (FILE * oFile, const char *name) { - if (TARGET_IS_DS390) + /* if (TARGET_IS_DS390) */ + if (options.model == MODEL_FLAT24) { fprintf (oFile, "\t.byte %s,(%s >> 8),(%s >> 16)", name, name, name); } @@ -870,7 +884,7 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) /* check the type */ if (compareType (type, val->type) == 0) - werror (E_INIT_WRONG); + werror (W_INIT_WRONG); /* if val is literal */ if (IS_LITERAL (val->etype)) @@ -982,40 +996,37 @@ emitStaticSeg (memmap * map, FILE * out) addSetHead (&publics, sym); /* print extra debug info if required */ - if ((options.debug || sym->level == 0) && !options.nodebug) - { - - cdbSymbol (sym, cdbFile, FALSE, FALSE); - - if (!sym->level) - { /* global */ - if (IS_STATIC (sym->etype)) - fprintf (out, "F%s$", moduleName); /* scope is file */ - else - fprintf (out, "G$"); /* scope is global */ - } - else - /* symbol is local */ - fprintf (out, "L%s$", - (sym->localof ? sym->localof->name : "-null-")); - fprintf (out, "%s$%d$%d", sym->name, sym->level, sym->block); - } - + if (options.debug) { + cdbSymbol (sym, cdbFile, FALSE, FALSE); + if (!sym->level) + { /* global */ + if (IS_STATIC (sym->etype)) + fprintf (out, "F%s$", moduleName); /* scope is file */ + else + fprintf (out, "G$"); /* scope is global */ + } + else + /* symbol is local */ + fprintf (out, "L%s$", + (sym->localof ? sym->localof->name : "-null-")); + fprintf (out, "%s$%d$%d", sym->name, sym->level, sym->block); + } + /* if it has an absolute address */ if (SPEC_ABSA (sym->etype)) { - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) fprintf (out, " == 0x%04x\n", SPEC_ADDR (sym->etype)); - + fprintf (out, "%s\t=\t0x%04x\n", sym->rname, SPEC_ADDR (sym->etype)); } else { - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) fprintf (out, " == .\n"); - + /* if it has an initial value */ if (sym->ival) { @@ -1088,16 +1099,16 @@ createInterruptVect (FILE * vFile) /* only if the main function exists */ if (!(mainf = findSymWithLevel (SymbolTab, mainf))) { - if (!options.cc_only) + if (!options.cc_only && !noAssemble) werror (E_NO_MAIN); return; } /* if the main is only a prototype ie. no body then do nothing */ - if (!mainf->fbody) + if (!IFFUNC_HASBODY(mainf->type)) { /* if ! compile only then main function should be present */ - if (!options.cc_only) + if (!options.cc_only && !noAssemble) werror (E_NO_MAIN); return; } @@ -1241,9 +1252,8 @@ emitOverlay (FILE * afile) continue; /* print extra debug info if required */ - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) { - cdbSymbol (sym, cdbFile, FALSE, FALSE); if (!sym->level) @@ -1265,7 +1275,7 @@ emitOverlay (FILE * afile) if (SPEC_ABSA (sym->etype)) { - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) fprintf (afile, " == 0x%04x\n", SPEC_ADDR (sym->etype)); fprintf (afile, "%s\t=\t0x%04x\n", @@ -1274,9 +1284,9 @@ emitOverlay (FILE * afile) } else { - if ((options.debug || sym->level == 0) && !options.nodebug) + if (options.debug) fprintf (afile, "==.\n"); - + /* allocate space */ tfprintf (afile, "!labeldef\n", sym->rname); tfprintf (afile, "\t!ds\n", (unsigned int) getSize (sym->type) & 0xffff); @@ -1298,7 +1308,7 @@ glue () addSetHead (&tmpfileSet, ovrFile); /* print the global struct definitions */ - if (options.debug && !options.nodebug) + if (options.debug) cdbStructBlock (0, cdbFile); vFile = tempfile (); @@ -1379,7 +1389,7 @@ glue () copyFile (asmFile, ovrFile); /* create the stack segment MOF */ - if (mainf && mainf->fbody) + if (mainf && IFFUNC_HASBODY(mainf->type)) { fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; Stack segment in internal ram \n"); @@ -1401,7 +1411,7 @@ glue () copyFile (asmFile, bit->oFile); /* if external stack then reserve space of it */ - if (mainf && mainf->fbody && options.useXstack) + if (mainf && IFFUNC_HASBODY(mainf->type) && options.useXstack) { fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; external stack \n"); @@ -1418,7 +1428,7 @@ glue () copyFile (asmFile, xdata->oFile); /* copy the interrupt vector table */ - if (mainf && mainf->fbody) + if (mainf && IFFUNC_HASBODY(mainf->type)) { fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; interrupt vector \n"); @@ -1441,7 +1451,7 @@ glue () tfprintf (asmFile, "\t!area\n", port->mem.post_static_name); tfprintf (asmFile, "\t!area\n", port->mem.static_name); - if (mainf && mainf->fbody) + if (mainf && IFFUNC_HASBODY(mainf->type)) { fprintf (asmFile, "__sdcc_gsinit_startup:\n"); /* if external stack is specified then the @@ -1476,7 +1486,7 @@ glue () } copyFile (asmFile, statsg->oFile); - if (port->general.glue_up_main && mainf && mainf->fbody) + if (port->general.glue_up_main && mainf && IFFUNC_HASBODY(mainf->type)) { /* This code is generated in the post-static area. * This area is guaranteed to follow the static area @@ -1498,7 +1508,7 @@ glue () fprintf (asmFile, "; code\n"); fprintf (asmFile, "%s", iComments2); tfprintf (asmFile, "\t!areacode\n", CODE_NAME); - if (mainf && mainf->fbody) + if (mainf && IFFUNC_HASBODY(mainf->type)) { /* entry point @ start of CSEG */ @@ -1527,6 +1537,42 @@ glue () applyToSet (tmpfileNameSet, rmTmpFiles); } +#if defined (__MINGW32__) || defined (__CYGWIN__) || defined (_MSC_VER) +void +rm_tmpfiles (void) +{ + applyToSet (tmpfileSet, closeTmpFiles); + applyToSet (tmpfileNameSet, rmTmpFiles); +} +#endif + +/** Creates a temporary file name a'la tmpnam which avoids the bugs + in cygwin wrt c:\tmp. + Scans, in order: TMP, TEMP, TMPDIR, else uses tmpfile(). +*/ +char * +tempfilename (void) +{ +#if !defined(_MSC_VER) + const char *tmpdir = NULL; + if (getenv ("TMP")) + tmpdir = getenv ("TMP"); + else if (getenv ("TEMP")) + tmpdir = getenv ("TEMP"); + else if (getenv ("TMPDIR")) + tmpdir = getenv ("TMPDIR"); + if (tmpdir) + { + char *name = tempnam (tmpdir, "sdcc"); + if (name) + { + return name; + } + } +#endif + return tmpnam (NULL); +} + /** Creates a temporary file a'la tmpfile which avoids the bugs in cygwin wrt c:\tmp. Scans, in order: TMP, TEMP, TMPDIR, else uses tmpfile(). @@ -1544,7 +1590,7 @@ tempfile (void) tmpdir = getenv ("TMPDIR"); if (tmpdir) { - char *name = tempnam (tmpdir, "sdcc"); + char *name = Safe_strdup( tempnam (tmpdir, "sdcc")); if (name) { FILE *fp = fopen (name, "w+b"); @@ -1560,11 +1606,3 @@ tempfile (void) return tmpfile (); } -char * -gc_strdup (const char *s) -{ - char *ret; - ret = Safe_calloc (1, strlen (s) + 1); - strcpy (ret, s); - return ret; -}