#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 <unistd.h>
-#undef link
-#else
-
#include <unistd.h>
#endif
-#else
-// No unistd.h in Borland C++
-#endif
symbol *interrupts[256];
}
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)) {
static void
emitRegularMap (memmap * map, bool addPublics, bool arFlag)
{
- symbol *sym;
+ symbol *sym, *symIval;
+ ast *ival = NULL;
+ memmap *segment;
if (addPublics)
{
/* if allocation required check is needed
then check if the symbol really requires
allocation only for local variables */
+ if (!sym->allocreq) continue;
+
if (arFlag && !IS_AGGREGATE (sym->type) &&
!(sym->_isparm && !IS_REGPARM (sym->etype)) &&
!sym->allocreq && sym->level)
(sym->_isparm && !IS_REGPARM (sym->etype))) &&
addPublics &&
!IS_STATIC (sym->etype) &&
- (sym->used || sym->fbody))
+ (IS_FUNC(sym->type) ? (sym->used || sym->fbody) : 1))
{
addSetHead (&publics, sym);
}
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));
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)
{
- ast *ival = NULL;
-
- 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
+ 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 (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;
}
}
return val;
}
wrong:
- werror (E_INIT_WRONG);
+ werror (W_INIT_WRONG);
return NULL;
}
/* return the generic pointer high byte for a given pointer type. */
/*-----------------------------------------------------------------*/
int
-pointerTypeToGPByte (const int p_type)
+pointerTypeToGPByte (const int p_type, const char *iname, const char *oname)
{
switch (p_type)
{
/* hack - if we get a generic pointer, we just assume
* it's an FPOINTER (i.e. in XDATA space).
*/
+ werror (E_CANNOT_USE_GENERIC_POINTER, iname, oname);
+ exit (1);
+ // fall through
case FPOINTER:
return 1;
case CPOINTER:
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);
}
/* printGPointerType - generates ival for generic pointer type */
/*-----------------------------------------------------------------*/
void
-printGPointerType (FILE * oFile, const char *name,
+printGPointerType (FILE * oFile, const char *iname, const char *oname,
const unsigned int type)
{
- _printPointerType (oFile, name);
- fprintf (oFile, ",#0x%02x\n", pointerTypeToGPByte (type));
+ _printPointerType (oFile, iname);
+ fprintf (oFile, ",#0x%02x\n", pointerTypeToGPByte (type, iname, oname));
}
/*-----------------------------------------------------------------*/
/* no of elements given and we */
/* have generated for all of them */
- if (!--lcnt)
+ if (!--lcnt) {
+ /* if initializers left */
+ if (iloop) {
+ werror (W_EXESS_ARRAY_INITIALIZERS, sym->name, sym->lineDef);
+ }
break;
+ }
}
/* if we have not been given a size */
val = list2val (ilist);
/* check the types */
- if ((dLvl = checkType (val->type, type->next)) <= 0)
+ if ((dLvl = compareType (val->type, type->next)) <= 0)
{
tfprintf (oFile, "\t!dw !constword\n", 0);
return;
}
else if (size == GPTRSIZE)
{
- /* PENDING: 0x02 or 0x%02x, CDATA? */
- printGPointerType (oFile, val->name,
- (IS_PTR (val->type) ? DCL_TYPE (val->type) :
- PTR_TYPE (SPEC_OCLS (val->etype))));
+ int type;
+ if (IS_PTR (val->type)) {
+ type = DCL_TYPE (val->type);
+ } else {
+ type = PTR_TYPE (SPEC_OCLS (val->etype));
+ }
+ if (val->sym && val->sym->isstrlit) {
+ // this is a literal string
+ type=CPOINTER;
+ }
+ printGPointerType (oFile, val->name, sym->name, type);
}
else
{
return;
/* check the type */
- if (checkType (type, val->type) == 0)
- werror (E_INIT_WRONG);
+ if (compareType (type, val->type) == 0)
+ werror (W_INIT_WRONG);
/* if val is literal */
if (IS_LITERAL (val->etype))
}
else if (size == GPTRSIZE)
{
- printGPointerType (oFile, val->name,
+ printGPointerType (oFile, val->name, sym->name,
(IS_PTR (val->type) ? DCL_TYPE (val->type) :
PTR_TYPE (SPEC_OCLS (val->etype))));
}
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)
{
void
emitMaps ()
{
+ inInitMode++;
/* no special considerations for the following
data, idata & bit & xdata */
emitRegularMap (data, TRUE, TRUE);
emitRegularMap (code, TRUE, FALSE);
emitStaticSeg (statsg, code->oFile);
+ inInitMode--;
}
/*-----------------------------------------------------------------*/
/* 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 (!mainf->fbody)
{
/* if ! compile only then main function should be present */
- if (!options.cc_only)
+ if (!options.cc_only && !noAssemble)
werror (E_NO_MAIN);
return;
}
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)
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",
}
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);
addSetHead (&tmpfileSet, ovrFile);
/* print the global struct definitions */
- if (options.debug && !options.nodebug)
+ if (options.debug)
cdbStructBlock (0, cdbFile);
vFile = tempfile ();
if (!options.c1mode)
{
- sprintf (buffer, srcFileName);
- strcat (buffer, port->assembler.file_ext);
+ sprintf (scratchFileName, srcFileName);
+ strcat (scratchFileName, port->assembler.file_ext);
}
else
{
- strcpy (buffer, options.out_name);
+ strcpy (scratchFileName, options.out_name);
}
- if (!(asmFile = fopen (buffer, "w")))
+ if (!(asmFile = fopen (scratchFileName, "w")))
{
- werror (E_FILE_OPEN_ERR, buffer);
+ werror (E_FILE_OPEN_ERR, scratchFileName);
exit (1);
}
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 a'la tmpfile which avoids the bugs
in cygwin wrt c:\tmp.
Scans, in order: TMP, TEMP, TMPDIR, else uses tmpfile().
return tmpfile ();
}
-char *
-gc_strdup (const char *s)
-{
- char *ret;
- ret = Safe_calloc (1, strlen (s) + 1);
- strcpy (ret, s);
- return ret;
-}
projects / fw / sdcc / blobdiff