X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2FSDCCmem.c;h=b2a8c7b5dfca427c88d4b93cb97839ee1f3e7356;hb=7f56311838d848fe82447f141b7f7ceceb98e886;hp=dece30c26ef3fe7a78237ed3aaecb0b523673e31;hpb=6c3a4a7a8f3b36246191a21502a36393a89d65db;p=fw%2Fsdcc

diff --git a/src/SDCCmem.c b/src/SDCCmem.c
index dece30c2..b2a8c7b5 100644
--- a/src/SDCCmem.c
+++ b/src/SDCCmem.c
@@ -325,9 +325,9 @@ allocGlobal (symbol * sym)
       SPEC_OCLS (sym->etype) = code;
       /* if this is an interrupt service routine
          then put it in the interrupt service array */
-      if (FUNC_ISISR (sym->type) && !options.noiv)
+      if (FUNC_ISISR (sym->type) && !options.noiv
+          && (FUNC_INTNO (sym->type) != INTNO_UNSPEC))
 	{
-
 	  if (interrupts[FUNC_INTNO (sym->type)])
 	    werror (E_INT_DEFINED,
 		    FUNC_INTNO (sym->type),
@@ -375,6 +375,7 @@ allocGlobal (symbol * sym)
       return;
     }
 
+  if(!TARGET_IS_PIC16 || (TARGET_IS_PIC16 && sym->level))
   /* register storage class ignored changed to FIXED */
   if (SPEC_SCLS (sym->etype) == S_REGISTER)
     SPEC_SCLS (sym->etype) = S_FIXED;
@@ -392,6 +393,7 @@ allocGlobal (symbol * sym)
   /* if it is fixed, then allocate depending on the  */
   /* current memory model, same for automatics        */
   if (SPEC_SCLS (sym->etype) == S_FIXED ||
+      (TARGET_IS_PIC16 && (SPEC_SCLS (sym->etype) == S_REGISTER) && (sym->level==0)) ||
       SPEC_SCLS (sym->etype) == S_AUTO) {
     if (port->mem.default_globl_map != xdata) {
       /* set the output class */
@@ -766,7 +768,7 @@ overlay2data ()
       allocIntoSeg (sym);
     }
 
-  setToNull ((void **) &overlay->syms);
+  setToNull ((void *) &overlay->syms);
 
 }
 
@@ -787,7 +789,7 @@ overlay2Set ()
       addSet (&oset, sym);
     }
 
-  setToNull ((void **) &overlay->syms);
+  setToNull ((void *) &overlay->syms);
   addSet (&ovrSetSets, oset);
 
 }
@@ -816,6 +818,7 @@ allocVariables (symbol * symChain)
 	  if (csym && csym->level == sym->level)
 	    werror (E_DUPLICATE_TYPEDEF, sym->name);
 
+	  SPEC_EXTR (sym->etype) = 0;
 	  addSym (TypedefTab, sym, sym->name, sym->level, sym->block, 0);
 	  continue;		/* go to the next one         */
 	}
@@ -976,7 +979,7 @@ printAllocInfoSeg (memmap * map, symbol * func, FILE * of)
     return;
   if (!map->syms)
     return;
-
+  
   for (sym = setFirstItem (map->syms); sym;
        sym = setNextItem (map->syms))
     {
@@ -985,7 +988,8 @@ printAllocInfoSeg (memmap * map, symbol * func, FILE * of)
 	continue;
       if (sym->localof != func)
 	continue;
-      fprintf (of, ";%-25s Allocated to ", sym->name);
+      
+      fprintf (of, ";%-25s Allocated ", sym->name);
 
       /* if assigned to registers */
       if (!sym->allocreq && sym->reqv)
@@ -993,22 +997,29 @@ printAllocInfoSeg (memmap * map, symbol * func, FILE * of)
 	  int i;
 
 	  sym = OP_SYMBOL (sym->reqv);
-	  fprintf (of, "registers ");
-	  for (i = 0; i < 4 && sym->regs[i]; i++)
-	    fprintf (of, "%s ", port->getRegName (sym->regs[i]));
-	  fprintf (of, "\n");
-	  continue;
+	  if (!sym->isspilt || sym->remat)
+	    {
+	      fprintf (of, "to registers ");
+	      for (i = 0; i < 4 && sym->regs[i]; i++)
+		fprintf (of, "%s ", port->getRegName (sym->regs[i]));
+	      fprintf (of, "\n");
+	      continue;
+	    }
+	  else
+	    {
+	      sym = sym->usl.spillLoc;
+	    }
 	}
 
       /* if on stack */
       if (sym->onStack)
 	{
-	  fprintf (of, "stack - offset %d\n", sym->stack);
+	  fprintf (of, "to stack - offset %d\n", sym->stack);
 	  continue;
 	}
 
       /* otherwise give rname */
-      fprintf (of, "in memory with name '%s'\n", sym->rname);
+      fprintf (of, "with name '%s'\n", sym->rname);
     }
 }
 
@@ -1090,7 +1101,7 @@ printAllocInfo (symbol * func, FILE * of)
     
   if (!of)
     of = stdout;
-    
+
   /* must be called after register allocation is complete */
   fprintf (of, ";------------------------------------------------------------\n");
   fprintf (of, ";Allocation info for local variables in function '%s'\n", func->name);
@@ -1104,5 +1115,20 @@ printAllocInfo (symbol * func, FILE * of)
   printAllocInfoSeg (idata, func, of);
   printAllocInfoSeg (sfr, func, of);
   printAllocInfoSeg (sfrbit, func, of);
+  
+  {
+    set *ovrset;
+    set *tempOverlaySyms = overlay->syms;
+    
+    /* search the set of overlay sets for local variables/parameters */
+    for (ovrset = setFirstItem (ovrSetSets); ovrset;
+         ovrset = setNextItem (ovrSetSets))
+      {
+        overlay->syms = ovrset;
+        printAllocInfoSeg (overlay, func, of);
+      }
+    overlay->syms = tempOverlaySyms;
+  }
+  
   fprintf (of, ";------------------------------------------------------------\n");
 }