fix dump reg on next

[fw/sdcc] / src / SDCCglue.c

diff --git a/src/SDCCglue.c b/src/SDCCglue.c
index 9a4c15fada0e44a2015a38a621c1c55ccfb8d647..e8922ec841debb17375afbee0f9e0123c1fdff7f 100644 (file)
--- 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;
       }
 
@@ -301,11 +279,19 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
          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,
+         if (TARGET_IS_XA51) {
+           if (map==sfr) {
+             equ="sfr";
+           } else if (map==bit || map==sfrbit) {
+             equ="bit";
+           }
+         }
+         fprintf (map->oFile, "%s\t%s\t0x%04x\n",
+                  sym->rname, equ,
                   SPEC_ADDR (sym->etype));
        }
       else {
@@ -331,7 +317,7 @@ emitRegularMap (memmap * map, bool addPublics, bool arFlag)
 /* initPointer - pointer initialization code massaging             */
 /*-----------------------------------------------------------------*/
 value *
-initPointer (initList * ilist)
+initPointer (initList * ilist, sym_link *toType)
 {
        value *val;
        ast *expr = list2expr (ilist);
@@ -343,6 +329,17 @@ initPointer (initList * ilist)
        if ((val = constExprValue (expr, FALSE)))
                return val;
        
+       /* (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 */
@@ -959,7 +956,7 @@ printIvalPtr (symbol * sym, sym_link * type, initList * ilist, FILE * oFile)
       return;
     }
 
-  if (!(val = initPointer (ilist)))
+  if (!(val = initPointer (ilist, type)))
     return;
 
   /* if character pointer */
@@ -1165,7 +1162,7 @@ emitMaps ()
 
   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--;
@@ -1310,15 +1307,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 */
        }
@@ -1326,8 +1314,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;
 
@@ -1488,10 +1475,12 @@ glue ()
 
 
   /* 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))
@@ -1504,10 +1493,12 @@ glue ()
     }
 
   /* 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);