static void
emitRegularMap (memmap * map, bool addPublics, bool arFlag)
{
- symbol *sym, *symIval;
+ symbol *sym;
ast *ival = NULL;
- memmap *segment;
+
+ if (!map)
+ return;
if (addPublics)
{
else
tfprintf (map->oFile, "\t!area\n", map->sname);
}
-
- /* print the area name */
+
for (sym = setFirstItem (map->syms); sym;
sym = setNextItem (map->syms))
{
+ symbol *newSym=NULL;
/* if extern then add it into the extern list */
if (IS_EXTERN (sym->etype))
{
- addSetHead (&externs, sym);
+ addSetHead (&externs, sym);
continue;
}
fprintf (map->oFile, "%s$%d$%d", sym->name, sym->level, sym->block);
}
+ /* if it has an initial value then do it only if
+ it is a global variable */
+ if (sym->ival && sym->level == 0) {
+ if (SPEC_OCLS(sym->etype)==xidata) {
+ // 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);
+ SPEC_CONST(newSym->etype)=1;
+ SPEC_STAT(newSym->etype)=1;
+ resolveIvalSym(newSym->ival);
+
+ // add it to the "XINIT (CODE)" segment
+ addSet(&xinit->syms, newSym);
+ sym->ival=NULL;
+ } else {
+ if (IS_AGGREGATE (sym->type)) {
+ ival = initAggregates (sym, sym->ival, NULL);
+ } else {
+ if (getNelements(sym->type, sym->ival)>1) {
+ werror (W_EXCESS_INITIALIZERS, "scalar",
+ sym->name, sym->lineDef);
+ }
+ ival = newNode ('=', newAst_VALUE (symbolVal (sym)),
+ decorateType (resolveSymbols (list2expr (sym->ival))));
+ }
+ codeOutFile = statsg->oFile;
+
+ 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;
+ }
+
/* if is has an absolute address then generate
an equate for this no need to allocate space */
if (SPEC_ABSA (sym->etype))
sym->rname,
SPEC_ADDR (sym->etype));
}
- else
- {
- /* 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) getSize (sym->type) & 0xffff);
+ else {
+ int size = getSize (sym->type);
+ if (size==0) {
+ werror(E_UNKNOWN_SIZE,sym->name);
}
-
- /* 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)) {
- ival = initAggregates (sym, sym->ival, NULL);
- } 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;
+ /* 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) &&
/* printIvalType - generates ival for int/char */
/*-----------------------------------------------------------------*/
void
-printIvalType (sym_link * type, initList * ilist, FILE * oFile)
+printIvalType (symbol *sym, sym_link * type, initList * ilist, FILE * oFile)
{
value *val;
if (ilist->type == INIT_DEEP)
ilist = ilist->init.deep;
- val = list2val (ilist);
+ if (!IS_AGGREGATE(sym->type) && getNelements(type, ilist)>1) {
+ werror (W_EXCESS_INITIALIZERS, "scalar", sym->name, sym->lineDef);
+ }
+
+ if (!(val = list2val (ilist))) {
+ // assuming a warning has been thrown
+ val=constVal("0");
+ }
+
+ if (val->type != type) {
+ val = valCastLiteral(type, floatFromVal(val));
+ }
+
switch (getSize (type)) {
case 1:
if (!val)
if (IS_BITFIELD(sflds->type)) {
printIvalBitFields(&sflds,&iloop,oFile);
} else {
- printIval (sflds, sflds->type, iloop, oFile);
+ printIval (sym, sflds->type, iloop, oFile);
}
}
+ if (iloop) {
+ werror (W_EXCESS_INITIALIZERS, "struct", sym->name, sym->lineDef);
+ }
return;
}
/* 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)
{
if (!--lcnt) {
/* if initializers left */
if (iloop) {
- werror (W_EXESS_ARRAY_INITIALIZERS, sym->name, sym->lineDef);
+ werror (W_EXCESS_INITIALIZERS, "array", sym->name, sym->lineDef);
}
break;
}
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)
{
}
else
{
- /* What is this case? Are these pointers? */
+ // these are literals assigned to pointers
switch (size)
{
case 1:
aopLiteral (val, 0), aopLiteral (val, 1));
break;
case 3:
- /* PENDING: 0x02 or 0x%02x, CDATA? */
- fprintf (oFile, "\t.byte %s,%s,#0x02\n",
- aopLiteral (val, 0), aopLiteral (val, 1));
+ 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, 0),
+ aopLiteral (val, 1),
+ aopLiteral (val, 2));
+ break;
+ case 4:
+ 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",
+ aopLiteral (val, 0),
+ aopLiteral (val, 1),
+ aopLiteral (val, 2),
+ aopLiteral (val, 3));
break;
default:
assert (0);
/* if type is SPECIFIER */
if (IS_SPEC (type))
{
- printIvalType (type, ilist, oFile);
+ printIvalType (sym, type, ilist, oFile);
return;
}
}
{
symbol *sym;
- /* fprintf(map->oFile,"\t.area\t%s\n",map->sname); */
- if (!out)
- out = code->oFile;
+ /* fprintf(out, "\t.area\t%s\n", map->sname); */
/* for all variables in this segment do */
for (sym = setFirstItem (map->syms); sym;
/* 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);
}
}
}
emitRegularMap (idata, TRUE, TRUE);
emitRegularMap (bit, TRUE, FALSE);
emitRegularMap (xdata, TRUE, TRUE);
+ if (port->genXINIT) {
+ emitRegularMap (xidata, TRUE, TRUE);
+ }
emitRegularMap (sfr, FALSE, FALSE);
emitRegularMap (sfrbit, FALSE, FALSE);
emitRegularMap (home, TRUE, FALSE);
emitRegularMap (code, TRUE, FALSE);
emitStaticSeg (statsg, code->oFile);
+ if (port->genXINIT) {
+ fprintf (code->oFile, "\t.area\t%s\n", xinit->sname);
+ emitStaticSeg (xinit, code->oFile);
+ }
inInitMode--;
}
if (!port->genIVT || !(port->genIVT (vFile, interrupts, maxInterrupts)))
{
/* "generic" interrupt table header (if port doesn't specify one).
-
* Look suspiciously like 8051 code to me...
*/
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))
{
- /* 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");
/* 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);
- }
-
+ }
+
}
}
}
fprintf (asmFile, "%s", iComments2);
copyFile (asmFile, xdata->oFile);
+ /* copy xternal initialized ram data */
+ fprintf (asmFile, "%s", iComments2);
+ fprintf (asmFile, "; external initialized ram data\n");
+ fprintf (asmFile, "%s", iComments2);
+ copyFile (asmFile, xidata->oFile);
+
/* copy the interrupt vector table */
if (mainf && IFFUNC_HASBODY(mainf->type))
{
/* initialise the stack pointer */
/* if the user specified a value then use it */
if (options.stack_loc)
- fprintf (asmFile, "\tmov\tsp,#%d\n", options.stack_loc);
+ fprintf (asmFile, "\tmov\tsp,#%d\n", options.stack_loc & 0xff);
else
/* no: we have to compute it */
if (!options.stackOnData && maxRegBank <= 3)
fprintf (asmFile, "\tljmp\t__sdcc_program_startup\n");
fprintf (asmFile, "__sdcc_init_data:\n");
+ // if the port can copy the XINIT segment to XISEG
+ if (port->genXINIT) {
+ port->genXINIT(asmFile);
+ }
+
}
copyFile (asmFile, statsg->oFile);
}
copyFile (asmFile, code->oFile);
+ if (port->genAssemblerEnd) {
+ port->genAssemblerEnd(asmFile);
+ }
fclose (asmFile);
applyToSet (tmpfileSet, closeTmpFiles);
applyToSet (tmpfileNameSet, rmTmpFiles);
projects / fw / sdcc / blobdiff