* doc/Makefile: fix install

[fw/sdcc] / src / SDCCglue.c

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 0347280d6f284fcd9356ddcf18a25997d27097c4..47584b541fdcdbad0a014a3fdabfcaef069159d7 100644 (file)
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -304,8 +304,8 @@ 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))));
@@ -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);
     }
   }
@@ -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);
            }
@@ -1509,7 +1508,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");