}
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);
}
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 (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;
}
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);
}
/* 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))
return tmpfile ();
}
-char *
-gc_strdup (const char *s)
-{
- char *ret;
- ret = Safe_calloc (1, strlen (s) + 1);
- strcpy (ret, s);
- return ret;
-}