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))
{
- addSetHead (&externs, sym);
+ addSetHead (&externs, sym);
continue;
}
// 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);
-
+ 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);
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 (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);
- }
-
+ if (ival) {
+ // set ival's lineno to where the symbol was defined
+ 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
+ }
+ allocInfo = 0;
+ eBBlockFromiCode (iCodeFromAst (ival));
+ allocInfo = 1;
+ }
+ }
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,
- SPEC_ADDR (sym->etype));
- }
- else
- {
- if (newSym) {
- // this has been moved to another segment
- } else {
- /* allocate space */
- if (options.debug) {
- fprintf (map->oFile, "==.\n");
+ if (TARGET_IS_XA51) {
+ if (map==sfr) {
+ equ="sfr";
+ } else if (map==bit || map==sfrbit) {
+ equ="bit";
}
- 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);
}
+ fprintf (map->oFile, "%s\t%s\t0x%04x\n",
+ sym->rname, equ,
+ SPEC_ADDR (sym->etype));
+ }
+ 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);
+ }
}
}
/* initPointer - pointer initialization code massaging */
/*-----------------------------------------------------------------*/
value *
-initPointer (initList * ilist)
+initPointer (initList * ilist, sym_link *toType)
{
value *val;
ast *expr = list2expr (ilist);
if ((val = constExprValue (expr, FALSE)))
return val;
+ /* ( ptr + constant ) */
+ if (IS_AST_OP (expr) &&
+ (expr->opval.op == '+' || expr->opval.op == '-') &&
+ IS_AST_SYM_VALUE (expr->left) &&
+ (IS_ARRAY(expr->left->ftype) || IS_PTR(expr->left->ftype)) &&
+ compareType(toType, expr->left->ftype) &&
+ IS_AST_LIT_VALUE (expr->right)) {
+ return valForCastAggr (expr->left, expr->left->ftype,
+ expr->right,
+ expr->opval.op);
+ }
+
+ /* (char *)&a */
+ if (IS_AST_OP(expr) && expr->opval.op==CAST &&
+ IS_AST_OP(expr->right) && expr->right->opval.op=='&') {
+ if (compareType(toType, expr->left->ftype)!=1) {
+ werror (W_INIT_WRONG);
+ printFromToType(expr->left->ftype, toType);
+ }
+ // skip the cast ???
+ expr=expr->right;
+ }
+
/* no then we have to do these cludgy checks */
/* pointers can be initialized with address of
a variable or address of an array element */
(&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) &&
expr->right, expr->opval.op);
}
-
/* case 4. (char *)(array type) */
if (IS_CAST_OP(expr) && IS_AST_SYM_VALUE (expr->right) &&
IS_ARRAY(expr->right->ftype)) {
return val;
}
wrong:
- werror (W_INIT_WRONG);
+ werror (E_INCOMPAT_PTYPES);
return NULL;
}
{
case IPOINTER:
case POINTER:
- return 0;
+ return GPTYPE_NEAR;
case GPOINTER:
- /* 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);
+ werror (E_CANNOT_USE_GENERIC_POINTER,
+ iname ? iname : "<null>",
+ oname ? oname : "<null>");
exit (1);
- // fall through
case FPOINTER:
- return 1;
+ return GPTYPE_FAR;
case CPOINTER:
- return 2;
+ return GPTYPE_CODE;
case PPOINTER:
- return 3;
+ return GPTYPE_XSTACK;
default:
fprintf (stderr, "*** internal error: unknown pointer type %d in GPByte.\n",
p_type);
werror (W_EXCESS_INITIALIZERS, "scalar", sym->name, sym->lineDef);
}
- val = list2val (ilist);
+ if (!(val = list2val (ilist))) {
+ // assuming a warning has been thrown
+ val=constVal("0");
+ }
+
if (val->type != type) {
val = valCastLiteral(type, floatFromVal(val));
}
/* 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 (E_CONST_EXPECTED);
+ 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 (!val) {
+ // an error has been thrown allready
+ val=constVal("0");
+ }
+
+ 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",
return;
}
- if (!(val = initPointer (ilist)))
+ if (!(val = initPointer (ilist, type)))
return;
/* if character pointer */
return;
/* check the type */
- if (compareType (type, val->type) == 0)
+ if (compareType (type, val->type) == 0) {
werror (W_INIT_WRONG);
+ printFromToType (val->type, type);
+ }
/* if val is literal */
if (IS_LITERAL (val->etype))
else
tfprintf (oFile, "\t.byte %s,%s\n", aopLiteral (val, 0), aopLiteral (val, 1));
break;
- case 3:
- fprintf (oFile, "\t.byte %s,%s,#0x02\n",
- aopLiteral (val, 0), aopLiteral (val, 1));
+ case 3: // how about '390??
+ fprintf (oFile, "\t.byte %s,%s,#0x%d\n",
+ aopLiteral (val, 0), aopLiteral (val, 1), GPTYPE_CODE);
}
return;
}
if (!ilist)
return;
+ /* update line number for error msgs */
+ lineno=sym->lineDef;
+
/* if structure then */
if (IS_STRUCT (type))
{
/* if it is not static add it to the public
table */
if (!IS_STATIC (sym->etype))
- addSetHead (&publics, sym);
+ {
+ addSetHead (&publics, sym);
+ }
/* print extra debug info if required */
if (options.debug) {
printIval (sym, sym->type, sym->ival, out);
noAlloc--;
}
- else
- {
+ else {
/* allocate space */
+ int size = getSize (sym->type);
+
+ if (size==0) {
+ werror(E_UNKNOWN_SIZE,sym->name);
+ }
fprintf (out, "%s:\n", sym->rname);
/* special case for character strings */
if (IS_ARRAY (sym->type) && IS_CHAR (sym->type->next) &&
SPEC_CVAL (sym->etype).v_char)
- printChar (out,
- SPEC_CVAL (sym->etype).v_char,
- strlen (SPEC_CVAL (sym->etype).v_char) + 1);
+ printChar (out,
+ SPEC_CVAL (sym->etype).v_char,
+ strlen (SPEC_CVAL (sym->etype).v_char) + 1);
else
- tfprintf (out, "\t!ds\n", (unsigned int) getSize (sym->type) & 0xffff);
+ tfprintf (out, "\t!ds\n", (unsigned int) size & 0xffff);
}
}
}
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--;
for (sym = setFirstItem (externs); sym;
sym = setNextItem (externs))
- tfprintf (afile, "\t!global\n", sym->rname);
+ tfprintf (afile, "\t!extern\n", sym->rname);
}
/*-----------------------------------------------------------------*/
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;
and addPublics allowed then add it to the public set */
if ((sym->_isparm && !IS_REGPARM (sym->etype))
&& !IS_STATIC (sym->etype))
- addSetHead (&publics, sym);
+ {
+ addSetHead (&publics, sym);
+ }
/* if extern then do nothing or is a function
then do nothing */
sym->rname,
SPEC_ADDR (sym->etype));
}
- else
- {
+ else {
+ int size = getSize(sym->type);
+
+ if (size==0) {
+ werror(E_UNKNOWN_SIZE,sym->name);
+ }
if (options.debug)
- fprintf (afile, "==.\n");
+ fprintf (afile, "==.\n");
/* allocate space */
tfprintf (afile, "!labeldef\n", sym->rname);
tfprintf (afile, "\t!ds\n", (unsigned int) getSize (sym->type) & 0xffff);
- }
-
+ }
+
}
}
}
/* 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);
}
copyFile (asmFile, code->oFile);
+ if (port->genAssemblerEnd) {
+ port->genAssemblerEnd(asmFile);
+ }
fclose (asmFile);
applyToSet (tmpfileSet, closeTmpFiles);
applyToSet (tmpfileNameSet, rmTmpFiles);
projects / fw / sdcc / blobdiff