X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCast.c;h=b313dc793e717975922e5489a3752d15a979cf58;hb=b49cdf35cae5b16ea87b7076739cecde4907ac83;hp=a831231c0f2dd5baa0819176110d1ecd0f89760a;hpb=6eef636baa36cbe6d9d1e3e3f4f4e8254a663e43;p=fw%2Fsdcc

diff --git a/src/SDCCast.c b/src/SDCCast.c
index a831231c..b313dc79 100644
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -186,8 +186,7 @@ copyAstValues (ast * dest, ast * src)
       break;
 
     case INLINEASM:
-      dest->values.inlineasm = Safe_alloc (strlen (src->values.inlineasm) + 1);
-      strcpy (dest->values.inlineasm, src->values.inlineasm);
+      dest->values.inlineasm =  Safe_strdup(src->values.inlineasm);
       break;
 
     case ARRAYINIT:
@@ -966,16 +965,10 @@ createIvalCharPtr (ast * sym, sym_link * type, ast * iexpr)
 				   newAst_VALUE (valueFromLit ((float) i))),
 			       newAst_VALUE (valueFromLit (*s))));
 
-      // now we don't need iexpr's symbol anymore
-      {
-	symbol *sym=AST_SYMBOL(iexpr);
-	memmap *segment=SPEC_OCLS(sym->etype);
-	if (segment) {
-	  deleteSetItem(&segment->syms, sym);
-	}
-      }
-      
-      return decorateType(resolveSymbols (rast));
+      // now WE don't need iexpr's symbol anymore
+      freeStringSymbol(AST_SYMBOL(iexpr));
+
+      return decorateType (resolveSymbols (rast));
     }
 
   return NULL;
@@ -1060,11 +1053,8 @@ gatherAutoInit (symbol * autoChain)
     {
 
       /* resolve the symbols in the ival */
-      if (sym->ival) {
-	noAlloc++;
+      if (sym->ival)
 	resolveIvalSym (sym->ival);
-	noAlloc--;
-      }
 
       /* if this is a static variable & has an */
       /* initial value the code needs to be lifted */
@@ -1141,6 +1131,20 @@ gatherAutoInit (symbol * autoChain)
   return init;
 }
 
+/*-----------------------------------------------------------------*/
+/* freeStringSymbol - delete a literal string if no more usage     */
+/*-----------------------------------------------------------------*/
+void freeStringSymbol(symbol *sym) {
+  /* make sure this is a literal string */
+  assert (sym->isstrlit);
+  if (--sym->isstrlit == 0) { // lower the usage count
+    memmap *segment=SPEC_OCLS(sym->etype);
+    if (segment) {
+      deleteSetItem(&segment->syms, sym);
+    }
+  }
+}
+  
 /*-----------------------------------------------------------------*/
 /* stringToSymbol - creates a symbol from a literal string         */
 /*-----------------------------------------------------------------*/
@@ -1150,10 +1154,22 @@ stringToSymbol (value * val)
   char name[SDCC_NAME_MAX + 1];
   static int charLbl = 0;
   symbol *sym;
+  set *sp;
+
+  // have we heard this before?
+  for (sp=statsg->syms; sp; sp=sp->next) {
+    sym=sp->item;
+    if (sym->isstrlit && 
+	!strcmp(SPEC_CVAL(sym->etype).v_char, SPEC_CVAL(val->etype).v_char)) {
+      // yes, this is old news. Don't publish it again.
+      sym->isstrlit++; // but raise the usage count
+      return symbolVal(sym);
+    }
+  }
 
-  sprintf (name, "_str_%d", charLbl++);
+  SNPRINTF (name, sizeof(name), "_str_%d", charLbl++);
   sym = newSymbol (name, 0);	/* make it @ level 0 */
-  strcpy (sym->rname, name);
+  strncpyz (sym->rname, name, SDCC_NAME_MAX);
 
   /* copy the type from the value passed */
   sym->type = copyLinkChain (val->type);
@@ -1298,7 +1314,7 @@ constExprValue (ast * cexpr, int check)
 	  val->sym = cexpr->opval.val->sym;
 	  val->sym->type = copyLinkChain (cexpr->ftype);
 	  val->sym->etype = getSpec (val->sym->type);
-	  strcpy (val->name, cexpr->opval.val->sym->rname);
+	  strncpyz (val->name, cexpr->opval.val->sym->rname, SDCC_NAME_MAX);
 	  return val;
 	}
 
@@ -2267,6 +2283,7 @@ decorateType (ast * tree)
 	ast *wtree = optimizeRRCRLC (tree);
 	if (wtree != tree)
 	  return decorateType (wtree);
+	// fall through
       }
       /*------------------------------------------------------------------*/
       /*----------------------------*/
@@ -2878,10 +2895,17 @@ decorateType (ast * tree)
       /* if they are pointers they must be castable */
       if (IS_PTR (LTYPE (tree)) && IS_PTR (RTYPE (tree)))
 	{
+	  if (tree->opval.op==EQ_OP && 
+	      !IS_GENPTR(LTYPE(tree)) && IS_GENPTR(RTYPE(tree))) {
+	    // we cannot cast a gptr to a !gptr: switch the leaves
+	    struct ast *s=tree->left;
+	    tree->left=tree->right;
+	    tree->right=s;
+	  }
 	  if (compareType (LTYPE (tree), RTYPE (tree)) == 0)
 	    {
 	      werror (E_COMPARE_OP);
-	      fprintf (stderr, "comparing type ");
+	      fprintf (stderr, "comparring type ");
 	      printTypeChain (LTYPE (tree), stderr);
 	      fprintf (stderr, "to type ");
 	      printTypeChain (RTYPE (tree), stderr);
@@ -2943,7 +2967,7 @@ decorateType (ast * tree)
     case SIZEOF:		/* evaluate wihout code generation */
       /* change the type to a integer */
       tree->type = EX_VALUE;
-      sprintf (buffer, "%d", (getSize (tree->right->ftype)));
+      SNPRINTF(buffer, sizeof(buffer), "%d", (getSize (tree->right->ftype)));
       tree->opval.val = constVal (buffer);
       tree->right = tree->left = NULL;
       TETYPE (tree) = getSpec (TTYPE (tree) =
@@ -3016,7 +3040,7 @@ decorateType (ast * tree)
 		    break;
 		}
 	    }
-	    sprintf (buffer, "%d", typeofv);
+	    SNPRINTF (buffer, sizeof(buffer), "%d", typeofv);
 	    tree->opval.val = constVal (buffer);
 	    tree->right = tree->left = NULL;
 	    TETYPE (tree) = getSpec (TTYPE (tree) =
@@ -3396,7 +3420,7 @@ sizeofOp (sym_link * type)
   checkTypeSanity(type, "(sizeof)");
 
   /* get the size and convert it to character  */
-  sprintf (buff, "%d", getSize (type));
+  SNPRINTF (buff, sizeof(buff), "%d", getSize (type));
 
   /* now convert into value  */
   return constVal (buff);
@@ -3430,7 +3454,7 @@ backPatchLabels (ast * tree, symbol * trueLabel, symbol * falseLabel)
       static int localLbl = 0;
       symbol *localLabel;
 
-      sprintf (buffer, "_and_%d", localLbl++);
+      SNPRINTF(buffer, sizeof(buffer), "_and_%d", localLbl++);
       localLabel = newSymbol (buffer, NestLevel);
 
       tree->left = backPatchLabels (tree->left, localLabel, falseLabel);
@@ -3456,7 +3480,7 @@ backPatchLabels (ast * tree, symbol * trueLabel, symbol * falseLabel)
       static int localLbl = 0;
       symbol *localLabel;
 
-      sprintf (buffer, "_or_%d", localLbl++);
+      SNPRINTF(buffer, sizeof(buffer), "_or_%d", localLbl++);
       localLabel = newSymbol (buffer, NestLevel);
 
       tree->left = backPatchLabels (tree->left, trueLabel, localLabel);
@@ -3548,7 +3572,7 @@ createLabel (symbol * label, ast * stmnt)
     label = newSymbol (label->name, label->level);
 
   /* change the name before putting it in add _ */
-  sprintf (name, "%s", label->name);
+  SNPRINTF(name, sizeof(name), "%s", label->name);
 
   /* put the label in the LabelSymbol table    */
   /* but first check if a label of the same    */
@@ -3636,7 +3660,8 @@ createCase (ast * swStat, ast * caseVal, ast * stmnt)
     }
 
   /* create the case label   */
-  sprintf (caseLbl, "_case_%d_%d",
+  SNPRINTF(caseLbl, sizeof(caseLbl), 
+	   "_case_%d_%d",
 	   swStat->values.switchVals.swNum,
 	   (int) floatFromVal (caseVal->opval.val));
 
@@ -3665,7 +3690,8 @@ createDefault (ast * swStat, ast * stmnt)
   swStat->values.switchVals.swDefault = 1;
 
   /* create the label  */
-  sprintf (defLbl, "_default_%d", swStat->values.switchVals.swNum);
+  SNPRINTF (defLbl, sizeof(defLbl),
+	    "_default_%d", swStat->values.switchVals.swNum);
   return createLabel (newSymbol (defLbl, 0), stmnt);
 }
 
@@ -3688,18 +3714,18 @@ createIf (ast * condAst, ast * ifBody, ast * elseBody)
   }
 
   /* create the labels */
-  sprintf (buffer, "_iffalse_%d", Lblnum);
+  SNPRINTF (buffer, sizeof(buffer), "_iffalse_%d", Lblnum);
   ifFalse = newSymbol (buffer, NestLevel);
   /* if no else body then end == false */
   if (!elseBody)
     ifEnd = ifFalse;
   else
     {
-      sprintf (buffer, "_ifend_%d", Lblnum);
+      SNPRINTF(buffer, sizeof(buffer), "_ifend_%d", Lblnum);
       ifEnd = newSymbol (buffer, NestLevel);
     }
 
-  sprintf (buffer, "_iftrue_%d", Lblnum);
+  SNPRINTF (buffer, sizeof(buffer), "_iftrue_%d", Lblnum);
   ifTrue = newSymbol (buffer, NestLevel);
 
   Lblnum++;
@@ -4331,7 +4357,7 @@ createFunction (symbol * name, ast * body)
     name->stack = SPEC_STAK (fetype) = stack;
 
   /* name needs to be mangled */
-  sprintf (name->rname, "%s%s", port->fun_prefix, name->name);
+  SNPRINTF (name->rname, sizeof(name->rname), "%s%s", port->fun_prefix, name->name);
 
   body = resolveSymbols (body);	/* resolve the symbols */
   body = decorateType (body);	/* propagateType & do semantic checks */
@@ -4468,9 +4494,7 @@ void ast_print (ast * tree, FILE *outfile, int indent)
 		return;
 	}
 	if (tree->opval.op == NULLOP) {
-		fprintf(outfile,"\n");
 		ast_print(tree->left,outfile,indent);
-		fprintf(outfile,"\n");
 		ast_print(tree->right,outfile,indent);
 		return ;
 	}
@@ -5030,15 +5054,23 @@ void ast_print (ast * tree, FILE *outfile, int indent)
 		fprintf(outfile,"IF (%p) \n",tree);
 		ast_print(tree->left,outfile,indent+2);
 		if (tree->trueLabel) {
-			INDENT(indent,outfile);
+			INDENT(indent+2,outfile);
 			fprintf(outfile,"NE(!=) 0 goto %s\n",tree->trueLabel->name);
 		}
 		if (tree->falseLabel) {
-			INDENT(indent,outfile);
+			INDENT(indent+2,outfile);
 			fprintf(outfile,"EQ(==) 0 goto %s\n",tree->falseLabel->name);
 		}
 		ast_print(tree->right,outfile,indent+2);
 		return ;
+		/*----------------------------*/
+		/* goto Statement              */
+		/*----------------------------*/
+	case GOTO:
+		fprintf(outfile,"GOTO (%p) \n",tree);
+		ast_print(tree->left,outfile,indent+2);
+		fprintf(outfile,"\n");
+		return ;
 		/*------------------------------------------------------------------*/
 		/*----------------------------*/
 		/* for Statement              */