static void
emitRegularMap (memmap * map, bool addPublics, bool arFlag)
{
- symbol *sym, *symIval;
+ symbol *sym;
ast *ival = NULL;
- memmap *segment;
+
+ if (!map)
+ return;
if (addPublics)
{
{
symbol *newSym=NULL;
-
/* if extern then add it into the extern list */
if (IS_EXTERN (sym->etype))
{
// create a new "XINIT (CODE)" symbol, that will be emitted later
newSym=copySymbol (sym);
SPEC_OCLS(newSym->etype)=xinit;
- sprintf (newSym->name, "_xinit_%s", sym->name);
- sprintf (newSym->rname,"_xinit_%s", sym->rname);
+ sprintf (newSym->name, "__xinit_%s", sym->name);
+ sprintf (newSym->rname,"__xinit_%s", sym->rname);
SPEC_CONST(newSym->etype)=1;
- //SPEC_STAT(newSym->etype)=1;
- addSym (SymbolTab, newSym, newSym->name, 0, 0, 1);
-
+ SPEC_STAT(newSym->etype)=1;
+ resolveIvalSym(newSym->ival);
+
// add it to the "XINIT (CODE)" segment
addSet(&xinit->syms, newSym);
-
- //fprintf (stderr, "moved %s from xdata to xidata\n", sym->rname);
-
+ sym->ival=NULL;
} else {
if (IS_AGGREGATE (sym->type)) {
ival = initAggregates (sym, sym->ival, NULL);
if (ival) {
// set ival's lineno to where the symbol was defined
- lineno=ival->lineno=sym->lineDef;
-#if 0
- // check if this is a constant expression
- if (constExprTree(ival->right)) {
- allocInfo = 0;
-#endif
- eBBlockFromiCode (iCodeFromAst (ival));
- allocInfo = 1;
-#if 0
- } else {
+ setAstLineno (ival, lineno=sym->lineDef);
+ // check if this is not a constant expression
+ if (!constExprTree(ival)) {
werror (E_CONST_EXPECTED, "found expression");
+ // but try to do it anyway
}
-#endif
+ allocInfo = 0;
+ 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;
}
an equate for this no need to allocate space */
if (SPEC_ABSA (sym->etype))
{
+ char *equ="=";
if (options.debug) {
fprintf (map->oFile, " == 0x%04x\n", SPEC_ADDR (sym->etype));
}
- fprintf (map->oFile, "%s\t=\t0x%04x\n",
- sym->rname,
+ if (TARGET_IS_XA51) {
+ if (map==sfr) {
+ equ="sfr";
+ } else if (map==bit || map==sfrbit) {
+ equ="bit";
+ }
+ }
+ fprintf (map->oFile, "%s\t%s\t0x%04x\n",
+ sym->rname, equ,
SPEC_ADDR (sym->etype));
}
else {
- if (newSym) {
- // this has been moved to another segment
- } else {
- int size = getSize (sym->type);
- if (size==0) {
- werror(E_UNKNOWN_SIZE,sym->name);
- }
- /* allocate space */
- 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) size & 0xffff);
- }
+ int size = getSize (sym->type);
+ if (size==0) {
+ werror(E_UNKNOWN_SIZE,sym->name);
+ }
+ /* allocate space */
+ 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) size & 0xffff);
}
}
}
(&some_struct)->element */
if (IS_AST_OP (expr->left) &&
expr->left->opval.op == PTR_OP &&
- IS_ADDRESS_OF_OP (expr->left->left))
- return valForStructElem (expr->left->left->left,
- expr->left->right);
-
+ IS_ADDRESS_OF_OP (expr->left->left)) {
+ return valForStructElem (expr->left->left->left,
+ expr->left->right);
+ }
}
/* case 3. (((char *) &a) +/- constant) */
if (IS_AST_OP (expr) &&
/* take care of the special case */
/* array of characters can be init */
/* by a string */
- if (IS_CHAR (type->next))
+ if (IS_CHAR (type->next)) {
+ if (!IS_LITERAL(list2val(ilist)->etype)) {
+ werror (W_INIT_WRONG);
+ return;
+ }
if (printIvalChar (type,
(ilist->type == INIT_DEEP ? ilist->init.deep : ilist),
oFile, SPEC_CVAL (sym->etype).v_char))
return;
-
+ }
/* not the special case */
if (ilist->type != INIT_DEEP)
{
int dLvl = 0;
val = list2val (ilist);
+
+ if (IS_LITERAL(val->etype)) {
+ if (compareType(type,val->etype)==0) {
+ werror (E_INCOMPAT_TYPES);
+ printFromToType (val->type, type);
+ }
+ printIvalCharPtr (NULL, type, val, oFile);
+ return;
+ }
+
/* check the types */
if ((dLvl = compareType (val->type, type->next)) <= 0)
{
aopLiteral (val, 0), aopLiteral (val, 1));
break;
case 3:
- // mcs51 generic pointer
- if (floatFromVal(val)!=0) {
+ if (IS_GENPTR(type) && floatFromVal(val)!=0) {
+ // non-zero mcs51 generic pointer
werror (E_LITERAL_GENERIC);
}
fprintf (oFile, "\t.byte %s,%s,%s\n",
aopLiteral (val, 2));
break;
case 4:
- // ds390 generic pointer
- if (floatFromVal(val)!=0) {
+ if (IS_GENPTR(type) && floatFromVal(val)!=0) {
+ // non-zero ds390 generic pointer
werror (E_LITERAL_GENERIC);
}
fprintf (oFile, "\t.byte %s,%s,%s,%s\n",
emitStaticSeg (statsg, code->oFile);
if (port->genXINIT) {
- fprintf (code->oFile, "\t.area\t%s\n", xinit->sname);
+ tfprintf (code->oFile, "\t!area\n", xinit->sname);
emitStaticSeg (xinit, code->oFile);
}
inInitMode--;
if (elementsInSet (ovrset))
{
-#if 0
- /* this dummy area is used to fool the assembler
- otherwise the assembler will append each of these
- declarations into one chunk and will not overlay
- sad but true */
- fprintf (afile, "\t.area _DUMMY\n");
-#else
- /* not anymore since asmain.c:1.13 */
-#endif
/* output the area informtion */
fprintf (afile, "\t.area\t%s\n", port->mem.overlay_name); /* MOF */
}
for (sym = setFirstItem (ovrset); sym;
sym = setNextItem (ovrset))
{
-
- /* if extern then add it to the publics tabledo nothing */
+ /* if extern then it is in the publics table: do nothing */
if (IS_EXTERN (sym->etype))
continue;
/* create the overlay segments */
- fprintf (asmFile, "%s", iComments2);
- fprintf (asmFile, "; overlayable items in internal ram \n");
- fprintf (asmFile, "%s", iComments2);
- copyFile (asmFile, ovrFile);
+ if (overlay) {
+ fprintf (asmFile, "%s", iComments2);
+ fprintf (asmFile, "; overlayable items in internal ram \n");
+ fprintf (asmFile, "%s", iComments2);
+ copyFile (asmFile, ovrFile);
+ }
/* create the stack segment MOF */
if (mainf && IFFUNC_HASBODY(mainf->type))
}
/* create the idata segment */
- fprintf (asmFile, "%s", iComments2);
- fprintf (asmFile, "; indirectly addressable internal ram data\n");
- fprintf (asmFile, "%s", iComments2);
- copyFile (asmFile, idata->oFile);
+ if (idata) {
+ fprintf (asmFile, "%s", iComments2);
+ fprintf (asmFile, "; indirectly addressable internal ram data\n");
+ fprintf (asmFile, "%s", iComments2);
+ copyFile (asmFile, idata->oFile);
+ }
/* copy the bit segment */
fprintf (asmFile, "%s", iComments2);
projects / fw / sdcc / blobdiff