X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmem.c;h=17a8859834d2ecc191d484da92da04eb583d0be0;hb=2de847a479c5a08a4e0dc8205a340809be8815f4;hp=a0e137d4998f46178c3f452ce389a5f8117738cf;hpb=8ca6e6b0b974cbce5ae477ff71e64d5b3322bb3a;p=fw%2Fsdcc

diff --git a/src/SDCCmem.c b/src/SDCCmem.c
index a0e137d4..17a88598 100644
--- a/src/SDCCmem.c
+++ b/src/SDCCmem.c
@@ -104,7 +104,12 @@ initMem ()
      DEBUG-NAME     -   'B'
      POINTER-TYPE   -   POINTER
    */
-  istack = allocMap (0, 0, 0, 0, 0, 0, options.stack_loc, ISTACK_NAME, 'B', POINTER);
+  if (ISTACK_NAME) {
+    istack = allocMap (0, 0, 0, 0, 0, 0, options.stack_loc, 
+		       ISTACK_NAME, 'B', POINTER);
+  } else {
+    istack=NULL;
+  }
 
   /* code  segment ;   
      SFRSPACE       -   NO
@@ -164,7 +169,11 @@ initMem ()
      DEBUG-NAME     -   'E'
      POINTER-TYPE   -   POINTER
    */
-  overlay = allocMap (0, 0, 0, 1, 0, 0, options.data_loc, DATA_NAME, 'E', POINTER);
+  if (OVERLAY_NAME) {
+    overlay = allocMap (0, 0, 0, 1, 0, 0, options.data_loc, DATA_NAME, 'E', POINTER);
+  } else {
+    overlay = NULL;
+  }
 
   /* Xternal Data segment - 
      SFRSPACE       -   NO
@@ -190,7 +199,12 @@ initMem ()
      DEBUG-NAME     -   'G'
      POINTER-TYPE   -   IPOINTER
    */
-  idata = allocMap (0, 0, 0, 0, 0, 0, options.idata_loc, IDATA_NAME, 'G', IPOINTER);
+  if (IDATA_NAME) {
+    idata = allocMap (0, 0, 0, 0, 0, 0, options.idata_loc, 
+		      IDATA_NAME, 'G', IPOINTER);
+  } else {
+    idata=NULL;
+  }
 
   /* Static segment (code for variables );
      SFRSPACE       -   NO
@@ -289,10 +303,13 @@ allocGlobal (symbol * sym)
 
   /* symbol name is internal name  */
   if (!sym->level)		/* local statics can come here */
-    sprintf (sym->rname, "%s%s", port->fun_prefix, sym->name);
+    SNPRINTF (sym->rname, sizeof(sym->rname), 
+	      "%s%s", port->fun_prefix, sym->name);
 
   /* add it to the operandKey reset */
-  addSet (&operKeyReset, sym);
+  if (!isinSet (operKeyReset, sym)) {
+    addSet(&operKeyReset, sym);
+  }
 
   /* if this is a literal e.g. enumerated type */
   /* put it in the data segment & do nothing   */
@@ -308,7 +325,7 @@ 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))
+      if (FUNC_ISISR (sym->type) && !options.noiv)
 	{
 
 	  if (interrupts[FUNC_INTNO (sym->type)])
@@ -334,14 +351,6 @@ allocGlobal (symbol * sym)
       SPEC_SCLS (sym->etype) == S_SBIT)
     {
 
-      /* if both absolute address & initial  */
-      /* value specified then error        */
-      if (IS_ABSOLUTE (sym->etype) && sym->ival)
-	{
-	  werror (E_SFR_INIT, sym->name);
-	  sym->ival = NULL;
-	}
-
       SPEC_OCLS (sym->etype) =
 	(SPEC_SCLS (sym->etype) == S_SFR ? sfr : sfrbit);
 
@@ -381,16 +390,19 @@ allocGlobal (symbol * sym)
     }
 
   /* if it is fixed, then allocate depending on the  */
-  /* current memory model,same for automatics        */
+  /* current memory model, same for automatics        */
   if (SPEC_SCLS (sym->etype) == S_FIXED ||
-      SPEC_SCLS (sym->etype) == S_AUTO)
-    {
+      SPEC_SCLS (sym->etype) == S_AUTO) {
+    if (port->mem.default_globl_map != xdata) {
       /* set the output class */
       SPEC_OCLS (sym->etype) = port->mem.default_globl_map;
       /* generate the symbol  */
       allocIntoSeg (sym);
       return;
+    } else {
+      SPEC_SCLS (sym->etype) = S_XDATA;
     }
+  }
 
   /* if code change to constant */
   if (SPEC_SCLS (sym->etype) == S_CODE) {
@@ -401,12 +413,12 @@ allocGlobal (symbol * sym)
 
   if (SPEC_SCLS (sym->etype) == S_XDATA)
     {
-      SPEC_OCLS (sym->etype) = xdata;
       // should we move this to the initialized data segment?
       if (port->genXINIT &&
 	  sym->ival && (sym->level==0) && !SPEC_ABSA(sym->etype)) {
 	SPEC_OCLS(sym->etype)=xidata;
-	addSet(&xidata->syms, sym);
+      } else {
+	SPEC_OCLS (sym->etype) = xdata;
       }
       allocIntoSeg (sym);
       return;
@@ -501,8 +513,9 @@ allocParms (value * val)
       else
 	{ /* allocate them in the automatic space */
 	  /* generate a unique name  */
-	  sprintf (lval->sym->rname, "%s%s_PARM_%d", port->fun_prefix, currFunc->name, pNum);
-	  strcpy (lval->name, lval->sym->rname);
+	  SNPRINTF (lval->sym->rname, sizeof(lval->sym->rname),
+		    "%s%s_PARM_%d", port->fun_prefix, currFunc->name, pNum);
+	  strncpyz (lval->name, lval->sym->rname, sizeof(lval->name));
 	  
 	  /* if declared in external storage */
 	  if (SPEC_SCLS (lval->etype) == S_XDATA)
@@ -543,14 +556,13 @@ deallocParms (value * val)
 
       /* unmark is myparm */
       lval->sym->ismyparm = 0;
-      /* if on stack then depending on which stack */
 
       /* delete it from the symbol table  */
       deleteSym (SymbolTab, lval->sym, lval->sym->name);
 
       if (!lval->sym->isref)
 	{
-	  lval->sym->allocreq = 1;
+	  lval->sym->allocreq = 0;
 	  werror (W_NO_REFERENCE, currFunc->name,
 		  "function argument", lval->sym->name);
 	}
@@ -560,14 +572,17 @@ deallocParms (value * val)
       if (lval->sym->rname[0])
 	{
 	  char buffer[SDCC_NAME_MAX];
-	  strcpy (buffer, lval->sym->rname);
+	  strncpyz (buffer, lval->sym->rname, sizeof(buffer));
 	  lval->sym = copySymbol (lval->sym);
-	  strcpy (lval->sym->rname, buffer);
-	  strcpy (lval->name, strcpy (lval->sym->name, lval->sym->rname));
+	  strncpyz (lval->sym->rname, buffer, sizeof(lval->sym->rname));
+	  strncpyz (lval->sym->name, buffer, sizeof(lval->sym->name));
+	  strncpyz (lval->name, buffer, sizeof(lval->name)); 
 	  addSym (SymbolTab, lval->sym, lval->sym->name,
 		  lval->sym->level, lval->sym->block, 1);
 	  lval->sym->_isparm = 1;
-	  addSet (&operKeyReset, lval->sym);
+	  if (!isinSet (operKeyReset, lval->sym)) {
+	    addSet(&operKeyReset, lval->sym);
+	  }
 	}
 
     }
@@ -583,9 +598,10 @@ allocLocal (symbol * sym)
 {
 
   /* generate an unique name */
-  sprintf (sym->rname, "%s%s_%s_%d_%d",
-	   port->fun_prefix,
-	   currFunc->name, sym->name, sym->level, sym->block);
+  SNPRINTF (sym->rname, sizeof(sym->rname), 
+	    "%s%s_%s_%d_%d",
+	    port->fun_prefix,
+	    currFunc->name, sym->name, sym->level, sym->block);
 
   sym->islocal = 1;
   sym->localof = currFunc;
@@ -659,15 +675,6 @@ allocLocal (symbol * sym)
   if (SPEC_SCLS (sym->etype) == S_SFR ||
       SPEC_SCLS (sym->etype) == S_SBIT)
     {
-
-      /* if both absolute address & initial  */
-      /* value specified then error        */
-      if (IS_ABSOLUTE (sym->etype) && sym->ival)
-	{
-	  werror (E_SFR_INIT, sym->name);
-	  sym->ival = NULL;
-	}
-
       SPEC_OCLS (sym->etype) =
 	(SPEC_SCLS (sym->etype) == S_SFR ? sfr : sfrbit);
 
@@ -702,11 +709,11 @@ allocLocal (symbol * sym)
      will remove and put into the 'data' segment if required after 
      overlay  analysis has been done */
   if (options.model == MODEL_SMALL) {
-    SPEC_OCLS (sym->etype) = 
-      (options.noOverlay ? port->mem.default_local_map
-       : overlay);
+      SPEC_OCLS (sym->etype) = 
+	(options.noOverlay ? port->mem.default_local_map
+	 : overlay);
   } else {
-    SPEC_OCLS (sym->etype) = port->mem.default_local_map;
+      SPEC_OCLS (sym->etype) = port->mem.default_local_map;
   }
   allocIntoSeg (sym);
 }
@@ -721,7 +728,7 @@ deallocLocal (symbol * csym)
 
   for (sym = csym; sym; sym = sym->next)
     {
-      if (sym->_isparm)
+      if (sym->_isparm) 
 	continue;
 
       /* if it is on the stack */
@@ -822,12 +829,13 @@ allocVariables (symbol * symChain)
       /* then args  processing  */
       if (funcInChain (csym->type))
 	{
-#if 1 // jwk: TODO should have been done already in addDecl() (oclass????)
 	  processFuncArgs (csym);
-#endif
+
 	  /* if register bank specified then update maxRegBank */
 	  if (maxRegBank < FUNC_REGBANK (csym->type))
 	    maxRegBank = FUNC_REGBANK (csym->type);
+	  /*JCF: Mark the register bank as used*/
+      RegBankUsed[FUNC_REGBANK(csym->type)]=1;
 	}
 
       /* if this is a extern variable then change the */
@@ -952,18 +960,6 @@ redoStackOffsets (void)
       xsPtr += size;
     }
 
-  /* if the debug option is set then output the
-     symbols to the map file */
-  if (options.debug)
-    {
-      for (sym = setFirstItem (istack->syms); sym;
-	   sym = setNextItem (istack->syms))
-	cdbSymbol (sym, cdbFile, FALSE, FALSE);
-
-      for (sym = setFirstItem (xstack->syms); sym;
-	   sym = setNextItem (xstack->syms))
-	cdbSymbol (sym, cdbFile, FALSE, FALSE);
-    }
 }
 
 /*-----------------------------------------------------------------*/
@@ -993,6 +989,7 @@ printAllocInfoSeg (memmap * map, symbol * func, FILE * of)
       if (!sym->allocreq && sym->reqv)
 	{
 	  int i;
+
 	  sym = OP_SYMBOL (sym->reqv);
 	  fprintf (of, "registers ");
 	  for (i = 0; i < 4 && sym->regs[i]; i++)
@@ -1061,6 +1058,10 @@ canOverlayLocals (eBBlock ** ebbs, int count)
 void 
 doOverlays (eBBlock ** ebbs, int count)
 {
+  if (!overlay) {
+    return;
+  }
+
   /* check if the parameters and local variables
      of this function can be put in the overlay segment
      This check is essentially to see if the function
@@ -1098,4 +1099,5 @@ printAllocInfo (symbol * func, FILE * of)
   printAllocInfoSeg (idata, func, of);
   printAllocInfoSeg (sfr, func, of);
   printAllocInfoSeg (sfrbit, func, of);
+  fprintf (of, ";------------------------------------------------------------\n");
 }