X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCglue.c;h=53f2d85ec4f18c3b05c1385941774003a8f873fb;hb=8fca63fbcde6e36936906190fa8e41f072a69e34;hp=748f6848b1f95b9984461838f145ea2d5bb9da3a;hpb=5d74cec95c1e4e29924b01ac1cf6e482388f7abe;p=fw%2Fsdcc

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 748f6848..53f2d85e 100644
--- a/src/SDCCglue.c
+++ b/src/SDCCglue.c
@@ -154,9 +154,11 @@ aopLiteral (value * val, int offset)
 static void 
 emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 {
-  symbol *sym, *symIval;
+  symbol *sym;
   ast *ival = NULL;
-  memmap *segment;
+
+  if (!map)
+    return;
 
   if (addPublics)
     {
@@ -239,10 +241,8 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 	  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);
-	  if (!IS_AGGREGATE(sym->type)) {
-	    resolveIvalSym(newSym->ival);
-	  }
+	  resolveIvalSym(newSym->ival);
+
 	  // add it to the "XINIT (CODE)" segment
 	  addSet(&xinit->syms, newSym);
 	  sym->ival=NULL;
@@ -259,15 +259,6 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 	  }
 	  codeOutFile = statsg->oFile;
 
-#if 0
-	  if (ival) {
-	    // set ival's lineno to where the symbol was defined
-	    lineno=ival->lineno=sym->lineDef;
-	    allocInfo = 0;
-	    eBBlockFromiCode (iCodeFromAst (ival));
-	    allocInfo = 1;
-	  }
-#else
 	  if (ival) {
 	    // set ival's lineno to where the symbol was defined
 	    setAstLineno (ival, lineno=sym->lineDef);
@@ -280,20 +271,7 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 	    eBBlockFromiCode (iCodeFromAst (ival));
 	    allocInfo = 1;
 	  }
-#endif
 	}	  
-
-	/* 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 && 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;
       }
 
@@ -738,12 +716,16 @@ printIvalArray (symbol * sym, sym_link * type, initList * ilist,
   /* 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)
     {
@@ -794,6 +776,16 @@ printIvalFuncPtr (sym_link * type, initList * ilist, FILE * oFile)
   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)
     {
@@ -893,8 +885,8 @@ printIvalCharPtr (symbol * sym, sym_link * type, value * val, FILE * oFile)
 		      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",
@@ -903,8 +895,8 @@ printIvalCharPtr (symbol * sym, sym_link * type, value * val, FILE * oFile)
 		   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",
@@ -1296,15 +1288,6 @@ emitOverlay (FILE * afile)
 
       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 */
 	}
@@ -1312,8 +1295,7 @@ emitOverlay (FILE * afile)
       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;