X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCglue.c;h=1a4913767ad331b6a58c8b801cf55487f272b63d;hb=238e1b53dc1ac88bd559c93bd7f355d0887d39e1;hp=4b63602144e1d771f7f06f0e5424b52f012408a4;hpb=fc41563d33a3da06336117a698f00206800e7827;p=fw%2Fsdcc diff --git a/src/SDCCglue.c b/src/SDCCglue.c index 4b636021..1a491376 100644 --- a/src/SDCCglue.c +++ b/src/SDCCglue.c @@ -294,7 +294,7 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag) else DCL_PTR_CONST (newSym->type) = 1; SPEC_STAT(newSym->etype)=1; - resolveIvalSym(newSym->ival); + resolveIvalSym(newSym->ival, newSym->type); // add it to the "XINIT (CODE)" segment addSet(&xinit->syms, newSym); @@ -304,11 +304,11 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag) ival = initAggregates (sym, sym->ival, NULL); } else { if (getNelements(sym->type, sym->ival)>1) { - werror (W_EXCESS_INITIALIZERS, "scalar", - sym->name, sym->lineDef); + werrorfl (filename, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar", + sym->name); } ival = newNode ('=', newAst_VALUE (symbolVal (sym)), - decorateType (resolveSymbols (list2expr (sym->ival)))); + decorateType (resolveSymbols (list2expr (sym->ival)), RESULT_CHECK)); } codeOutFile = statsg->oFile; @@ -351,7 +351,7 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag) else { int size = getSize (sym->type); if (size==0) { - werror(E_UNKNOWN_SIZE,sym->name); + werrorfl (filename, sym->lineDef, E_UNKNOWN_SIZE, sym->name); } /* allocate space */ if (options.debug) { @@ -492,7 +492,10 @@ initPointer (initList * ilist, sym_link *toType) return val; } wrong: - werror (E_INCOMPAT_PTYPES); + if (expr) + werrorfl (expr->filename, expr->lineno, E_INCOMPAT_PTYPES); + else + werror (E_INCOMPAT_PTYPES); return NULL; } @@ -512,7 +515,7 @@ printChar (FILE * ofile, char *s, int plen) while (len && pplen < plen) { i = 60; - while (i && *s && pplen < plen) + while (i && pplen < plen) { if (*s < ' ' || *s == '\"' || *s=='\\') { @@ -543,7 +546,11 @@ printChar (FILE * ofile, char *s, int plen) else len = 0; } - tfprintf (ofile, "\t!db !constbyte\n", 0); + while (pplen < plen) + { + tfprintf (ofile, "\t!db !constbyte\n", 0); + pplen++; + } } /*-----------------------------------------------------------------*/ @@ -739,7 +746,7 @@ printIvalStruct (symbol * sym, sym_link * type, sflds = SPEC_STRUCT (type)->fields; if (ilist->type != INIT_DEEP) { - werror (E_INIT_STRUCT, sym->name); + werrorfl (filename, sym->lineDef, E_INIT_STRUCT, sym->name); return; } @@ -753,7 +760,7 @@ printIvalStruct (symbol * sym, sym_link * type, } } if (iloop) { - werror (W_EXCESS_INITIALIZERS, "struct", sym->name, sym->lineDef); + werrorfl (filename, sym->lineDef, W_EXCESS_INITIALIZERS, "struct", sym->name); } return; } @@ -765,7 +772,6 @@ int printIvalChar (sym_link * type, initList * ilist, FILE * oFile, char *s) { value *val; - int remain; if (!s) { @@ -779,10 +785,6 @@ printIvalChar (sym_link * type, initList * ilist, FILE * oFile, char *s) printChar (oFile, SPEC_CVAL (val->etype).v_char, DCL_ELEM (type)); - if ((remain = (DCL_ELEM (type) - strlen (SPEC_CVAL (val->etype).v_char) - 1)) > 0) - while (remain--) - tfprintf (oFile, "\t!db !constbyte\n", 0); - return 1; } else @@ -808,7 +810,7 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, /* by a string */ if (IS_CHAR (type->next)) { if (!IS_LITERAL(list2val(ilist)->etype)) { - werror (E_CONST_EXPECTED); + werrorfl (filename, ilist->lineno, E_CONST_EXPECTED); return; } if (printIvalChar (type, @@ -819,7 +821,7 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, /* not the special case */ if (ilist->type != INIT_DEEP) { - werror (E_INIT_STRUCT, sym->name); + werrorfl (filename, ilist->lineno, E_INIT_STRUCT, sym->name); return; } @@ -828,7 +830,7 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist, printIval (sym, type->next, iloop, oFile); if (++size > DCL_ELEM(type)) { - werror (W_EXCESS_INITIALIZERS, "array", sym->name, sym->lineDef); + werrorfl (filename, sym->lineDef, W_EXCESS_INITIALIZERS, "array", sym->name); break; } } @@ -867,7 +869,7 @@ printIvalFuncPtr (sym_link * type, initList * ilist, FILE * oFile) if (IS_LITERAL(val->etype)) { if (compareType(type,val->etype)==0) { - werror (E_INCOMPAT_TYPES); + werrorfl (filename, ilist->lineno, E_INCOMPAT_TYPES); printFromToType (val->type, type); } printIvalCharPtr (NULL, type, val, oFile); @@ -978,7 +980,7 @@ printIvalCharPtr (symbol * sym, sym_link * type, value * val, FILE * oFile) case 3: if (IS_GENPTR(type) && floatFromVal(val)!=0) { // non-zero mcs51 generic pointer - werror (E_LITERAL_GENERIC); + werrorfl (filename, sym->lineDef, E_LITERAL_GENERIC); } if (port->little_endian) { fprintf (oFile, "\t.byte %s,%s,%s\n", @@ -995,7 +997,7 @@ printIvalCharPtr (symbol * sym, sym_link * type, value * val, FILE * oFile) case 4: if (IS_GENPTR(type) && floatFromVal(val)!=0) { // non-zero ds390 generic pointer - werror (E_LITERAL_GENERIC); + werrorfl (filename, sym->lineDef, E_LITERAL_GENERIC); } if (port->little_endian) { fprintf (oFile, "\t.byte %s,%s,%s,%s\n", @@ -1053,7 +1055,7 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) /* check the type */ if (compareType (type, val->type) == 0) { - werror (W_INIT_WRONG); + werrorfl (filename, ilist->lineno, W_INIT_WRONG); printFromToType (val->type, type); } @@ -1123,9 +1125,6 @@ printIval (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) if (!ilist) return; - /* update line number for error msgs */ - lineno=sym->lineDef; - /* if structure then */ if (IS_STRUCT (type)) { @@ -1144,8 +1143,8 @@ printIval (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) if (ilist->type!=INIT_NODE) { // or a 1-element list if (ilist->init.deep->next) { - werror (W_EXCESS_INITIALIZERS, "scalar", - sym->name, sym->lineDef); + werrorfl (filename, sym->lineDef, W_EXCESS_INITIALIZERS, "scalar", + sym->name); } else { ilist=ilist->init.deep; } @@ -1161,7 +1160,7 @@ printIval (symbol * sym, sym_link * type, initList * ilist, FILE * oFile) IS_PTR(type) && DCL_TYPE(type)==CPOINTER) { // no sweat } else { - werror (E_TYPE_MISMATCH, "assignment", " "); + werrorfl (filename, ilist->lineno, E_TYPE_MISMATCH, "assignment", " "); printFromToType(itype, type); } } @@ -1244,7 +1243,7 @@ emitStaticSeg (memmap * map, FILE * out) { fprintf (out, "%s:\n", sym->rname); noAlloc++; - resolveIvalSym (sym->ival); + resolveIvalSym (sym->ival, sym->type); printIval (sym, sym->type, sym->ival, out); noAlloc--; /* if sym is a simple string and sym->ival is a string, @@ -1260,7 +1259,7 @@ emitStaticSeg (memmap * map, FILE * out) int size = getSize (sym->type); if (size==0) { - werror(E_UNKNOWN_SIZE,sym->name); + werrorfl (filename, sym->lineDef, E_UNKNOWN_SIZE,sym->name); } fprintf (out, "%s:\n", sym->rname); /* special case for character strings */ @@ -1268,7 +1267,7 @@ emitStaticSeg (memmap * map, FILE * out) SPEC_CVAL (sym->etype).v_char) printChar (out, SPEC_CVAL (sym->etype).v_char, - strlen (SPEC_CVAL (sym->etype).v_char) + 1); + size); else tfprintf (out, "\t!ds\n", (unsigned int) size & 0xffff); } @@ -1355,14 +1354,21 @@ createInterruptVect (FILE * vFile) fprintf (vFile, "\tljmp\t__sdcc_gsinit_startup\n"); - /* now for the other interrupts */ for (; i < maxInterrupts; i++) { if (interrupts[i]) - fprintf (vFile, "\tljmp\t%s\n\t.ds\t5\n", interrupts[i]->rname); + { + fprintf (vFile, "\tljmp\t%s\n", interrupts[i]->rname); + if ( i != maxInterrupts - 1 ) + fprintf (vFile, "\t.ds\t5\n"); + } else - fprintf (vFile, "\treti\n\t.ds\t7\n"); + { + fprintf (vFile, "\treti\n"); + if ( i != maxInterrupts - 1 ) + fprintf (vFile, "\t.ds\t7\n"); + } } } } @@ -1509,7 +1515,7 @@ emitOverlay (FILE * afile) int size = getSize(sym->type); if (size==0) { - werror(E_UNKNOWN_SIZE,sym->name); + werrorfl (filename, sym->lineDef, E_UNKNOWN_SIZE); } if (options.debug) fprintf (afile, "==.\n"); @@ -1657,14 +1663,18 @@ glue (void) if (port->assembler.externGlobal) printExterns (asmFile); - if(mcs51_like) + if(( mcs51_like ) + ||( TARGET_IS_Z80 )) /*.p.t.20030924 need to output SFR table for Z80 as well */ { /* copy the sfr segment */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; special function registers\n"); fprintf (asmFile, "%s", iComments2); copyFile (asmFile, sfr->oFile); - + } + + if(mcs51_like) + { /* copy the sbit segment */ fprintf (asmFile, "%s", iComments2); fprintf (asmFile, "; special function bits \n");