X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCopt.c;h=677f72b916170c8d5019cf5a58bdf0f9794b1420;hb=495053bd77d8a3381f6bba09bf6ad24c8298150f;hp=345f8484bbe3afd793d5d4a7c325a0f6ceb128e6;hpb=ed70c6e0de82527c2ee28c9c52a5eaf1b8f51650;p=fw%2Fsdcc

diff --git a/src/SDCCopt.c b/src/SDCCopt.c
index 345f8484..677f72b9 100644
--- a/src/SDCCopt.c
+++ b/src/SDCCopt.c
@@ -550,6 +550,31 @@ convertToFcall (eBBlock ** ebbs, int count)
     }
 }
 
+/*-----------------------------------------------------------------*/
+/* isLocalWithoutDef - return 1 if sym might be used without a     */
+/*                     defining iCode                              */
+/*-----------------------------------------------------------------*/
+static int
+isLocalWithoutDef (symbol * sym)
+{
+  if (!sym->level)
+    return 0;
+  
+  if (IS_STATIC (sym->etype))
+    return 0;
+  
+  if (IS_VOLATILE (sym->type))
+    return 0;
+  
+  if (sym->_isparm)
+    return 0;
+  
+  if (IS_AGGREGATE (sym->type))
+    return 0;
+  
+  return !sym->defs;
+}
+
 /*-----------------------------------------------------------------*/
 /* replaceRegEqv - replace all local variables with their reqv     */
 /*-----------------------------------------------------------------*/
@@ -558,6 +583,12 @@ replaceRegEqv (eBBlock ** ebbs, int count)
 {
   int i;
 
+  /* Update the symbols' def bitvector so we know if there is   */
+  /* a defining iCode or not. Only replace a local variable     */
+  /* with its register equivalent if there is a defining iCode; */
+  /* otherwise, the port's register allocater may choke.        */
+  cseAllBlocks (ebbs, count, TRUE);
+
   for (i = 0; i < count; i++)
     {
 
@@ -571,7 +602,17 @@ replaceRegEqv (eBBlock ** ebbs, int count)
 
 	  if (ic->op == IFX)
 	    {
-
+	      if (IC_COND (ic) &&
+		  IS_TRUE_SYMOP (IC_COND (ic)) &&
+                  isLocalWithoutDef (OP_SYMBOL (IC_COND (ic))))
+		{
+		  werror (W_LOCAL_NOINIT,
+			  OP_SYMBOL (IC_COND (ic))->name,
+			  ic->filename, ic->lineno);
+		  OP_REQV (IC_COND (ic)) = NULL;
+		  OP_SYMBOL (IC_COND (ic))->allocreq = 1;
+		}
+	      
 	      if (IS_TRUE_SYMOP (IC_COND (ic)) &&
 		  OP_REQV (IC_COND (ic)))
 		IC_COND (ic) = opFromOpWithDU (OP_REQV (IC_COND (ic)),
@@ -581,8 +622,20 @@ replaceRegEqv (eBBlock ** ebbs, int count)
 	      continue;
 	    }
 
+	  
 	  if (ic->op == JUMPTABLE)
 	    {
+	      if (IC_JTCOND (ic) &&
+		  IS_TRUE_SYMOP (IC_JTCOND (ic)) &&
+                  isLocalWithoutDef (OP_SYMBOL (IC_JTCOND (ic))))
+		{
+		  werror (W_LOCAL_NOINIT,
+			  OP_SYMBOL (IC_JTCOND (ic))->name,
+			  ic->filename, ic->lineno);
+		  OP_REQV (IC_JTCOND (ic)) = NULL;
+		  OP_SYMBOL (IC_JTCOND (ic))->allocreq = 1;
+		}
+	      
 	      if (IS_TRUE_SYMOP (IC_JTCOND (ic)) &&
 		  OP_REQV (IC_JTCOND (ic)))
 		IC_JTCOND (ic) = opFromOpWithDU (OP_REQV (IC_JTCOND (ic)),
@@ -615,6 +668,17 @@ replaceRegEqv (eBBlock ** ebbs, int count)
 					  OP_SYMBOL (IC_RESULT (ic))->uses);
 	    }
 
+	  if (IC_RIGHT (ic) &&
+	      IS_TRUE_SYMOP (IC_RIGHT (ic)) &&
+	      isLocalWithoutDef (OP_SYMBOL (IC_RIGHT (ic))))
+	    {
+	      werror (W_LOCAL_NOINIT,
+		      OP_SYMBOL (IC_RIGHT (ic))->name,
+		      ic->filename, ic->lineno);
+	      OP_REQV (IC_RIGHT (ic)) = NULL;
+	      OP_SYMBOL (IC_RIGHT (ic))->allocreq = 1;
+	    }
+	  
 	  if (IC_RIGHT (ic) &&
 	      IS_TRUE_SYMOP (IC_RIGHT (ic)) &&
 	      OP_REQV (IC_RIGHT (ic)))
@@ -625,6 +689,17 @@ replaceRegEqv (eBBlock ** ebbs, int count)
 	      IC_RIGHT (ic)->isaddr = 0;
 	    }
 
+	  if (IC_LEFT (ic) &&
+	      IS_TRUE_SYMOP (IC_LEFT (ic)) &&
+	      isLocalWithoutDef (OP_SYMBOL (IC_LEFT (ic))))
+	    {
+	      werror (W_LOCAL_NOINIT,
+		      OP_SYMBOL (IC_LEFT (ic))->name,
+		      ic->filename, ic->lineno);
+	      OP_REQV (IC_LEFT (ic)) = NULL;
+	      OP_SYMBOL (IC_LEFT (ic))->allocreq = 1;
+	    }
+            
 	  if (IC_LEFT (ic) &&
 	      IS_TRUE_SYMOP (IC_LEFT (ic)) &&
 	      OP_REQV (IC_LEFT (ic)))
@@ -680,7 +755,9 @@ killDeadCode (eBBlock ** ebbs, int count)
 	      if (SKIP_IC (ic) ||
 		  ic->op == IFX ||
 		  ic->op == RETURN ||
-                  ic->op == DUMMY_READ_VOLATILE)
+                  ic->op == DUMMY_READ_VOLATILE ||
+                  ic->op == CRITICAL ||
+                  ic->op == ENDCRITICAL)
 		continue;
 
 	      /* if the result is volatile then continue */
@@ -849,6 +926,12 @@ eBBlockFromiCode (iCode * ic)
   ebbs = iCodeBreakDown (ic, &count);
   saveCount = count;
 
+  /* hash the iCode keys so that we can quickly index */
+  /* them in the rest of the optimization steps */
+  setToNull ((void *) &iCodehTab);
+  iCodehTab = newHashTable (iCodeKey);
+  hashiCodeKeys (ebbs, count);
+  
   /* compute the control flow */
   computeControlFlow (ebbs, count, 0);
 
@@ -978,7 +1061,7 @@ eBBlockFromiCode (iCode * ic)
   port->assignRegisters (ebbs, count);
 
   /* throw away blocks */
-  setToNull ((void **) &graphEdges);
+  setToNull ((void *) &graphEdges);
   ebbs = NULL;
   
   return NULL;