X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCmem.c;h=54c8d0122bc92c5261b0e041b4f1458aa6082f0e;hb=4d406d0af5861a351d089724c5f3e6d1ee8f70d4;hp=e4f60ba7ac33e110313389871433f9b51dd072eb;hpb=d0654a8f79791ae227ac282b273640c476802e60;p=fw%2Fsdcc

diff --git a/src/SDCCmem.c b/src/SDCCmem.c
index e4f60ba7..54c8d012 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)])
@@ -504,8 +521,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)
@@ -562,14 +580,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);
+	  }
 	}
 
     }
@@ -585,9 +606,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;
@@ -824,12 +846,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 */
@@ -995,6 +1018,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++)
@@ -1063,6 +1087,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
@@ -1100,4 +1128,5 @@ printAllocInfo (symbol * func, FILE * of)
   printAllocInfoSeg (idata, func, of);
   printAllocInfoSeg (sfr, func, of);
   printAllocInfoSeg (sfrbit, func, of);
+  fprintf (of, ";------------------------------------------------------------\n");
 }