X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2FSDCCdflow.c;h=a45eb174b19f702ddf294e622eb0dd5153a6113b;hb=80972b2e54c9b88f11c27b878874fd2a6a681391;hp=afdba8eacaf113915ca97562e9176e0e35c98fa3;hpb=6fb875c0a19a0951a3d2bfdb203e2d2ed8038d4e;p=fw%2Fsdcc

diff --git a/src/SDCCdflow.c b/src/SDCCdflow.c
index afdba8ea..a45eb174 100644
--- a/src/SDCCdflow.c
+++ b/src/SDCCdflow.c
@@ -68,11 +68,11 @@ DEFSETFUNC (ifKilledInBlock)
 		   cdp->diCode->key);
   if (bitVectBitsInCommon (outs, OP_DEFS (cdp->sym)))
     {
-      setToNull ((void **) &outs);
+      setToNull ((void *) &outs);
       return 1;
     }
 
-  setToNull ((void **) &outs);
+  setToNull ((void *) &outs);
 
   /* if the operands of this one was changed in the block */
   /* then delete it */
@@ -82,6 +82,10 @@ DEFSETFUNC (ifKilledInBlock)
        (IS_SYMOP (IC_RIGHT (cdp->diCode)) &&
       bitVectBitsInCommon (src->defSet, OP_DEFS (IC_RIGHT (cdp->diCode))))))
     return 1;
+      
+  /* kill if cseBBlock() found a case we missed here */
+  if (isinSetWith(src->killedExprs, cdp, isCseDefEqual))
+    return 1;
 
   return 0;
 }
@@ -95,6 +99,8 @@ DEFSETFUNC (mergeInExprs)
   V_ARG (eBBlock *, dest);
   V_ARG (int *, firstTime);
 
+  dest->killedExprs = unionSets (dest->killedExprs, ebp->killedExprs, THROW_DEST);
+  
   /* if in the dominator list then */
   if (bitVectBitValue (dest->domVect, ebp->bbnum) && dest != ebp)
     {
@@ -117,17 +123,20 @@ DEFSETFUNC (mergeInExprs)
     }
   else
     {
-      /* delete only if killed in this block */
+      //if (dest != ebp)
+      //  dest->inExprs = intersectSets (dest->inExprs, ebp->outExprs, THROW_DEST);
+        
+      /* delete only if killed in this block*/
       deleteItemIf (&dest->inExprs, ifKilledInBlock, ebp);
       /* union the ndompset with pointers set in this block */
       dest->ndompset = bitVectUnion (dest->ndompset, ebp->ptrsSet);
     }
-
   *firstTime = 0;
 
   return 0;
 }
 
+
 /*-----------------------------------------------------------------*/
 /* mergeInDefs - merge in incoming definitions                     */
 /*-----------------------------------------------------------------*/
@@ -151,18 +160,23 @@ DEFSETFUNC (mergeInDefs)
 
 }
 
+
 /*-----------------------------------------------------------------*/
 /* computeDataFlow - does computations for data flow accross blocks */
 /*-----------------------------------------------------------------*/
 void 
-computeDataFlow (eBBlock ** ebbs, int count)
+computeDataFlow (ebbIndex * ebbi)
 {
+  eBBlock ** ebbs = ebbi->dfOrder;
+  int count = ebbi->count;
   int i;
   int change = 1;
-
+  
+  for (i = 0; i < count; i++)
+    ebbs[i]->killedExprs = NULL;
+      
   while (change)
     {
-
       change = 0;
 
       /* for all blocks */
@@ -170,7 +184,9 @@ computeDataFlow (eBBlock ** ebbs, int count)
 	{
 
 	  set *pred;
-	  set *oldOut;
+	  set *oldOutExprs = NULL;
+	  set *oldKilledExprs = NULL;
+          bitVect *oldOutDefs = NULL;
 	  int firstTime;
 	  eBBlock *pBlock;
 
@@ -182,10 +198,15 @@ computeDataFlow (eBBlock ** ebbs, int count)
 	  /* get blocks that can come to this block */
 	  pred = edgesTo (ebbs[i]);
 
-	  /* make a copy of the outExpressions : to be */
+	  /* make a copy of the outExpressions and outDefs : to be */
 	  /* used for iteration   */
-	  oldOut = setFromSet (ebbs[i]->outExprs);
-	  setToNull ((void **) &ebbs[i]->inDefs);
+	  if (optimize.global_cse)
+            {
+	      oldOutExprs = setFromSet (ebbs[i]->outExprs);
+	      oldKilledExprs = setFromSet (ebbs[i]->killedExprs);
+            }
+	  oldOutDefs = bitVectCopy (ebbs[i]->outDefs);
+	  setToNull ((void *) &ebbs[i]->inDefs);
 
 	  /* indefitions are easy just merge them by union */
 	  /* these are the definitions that can possibly   */
@@ -206,31 +227,36 @@ computeDataFlow (eBBlock ** ebbs, int count)
 	  /* get the immediate dominator and put it there */
 	  if (!pBlock)
 	    {
-	      eBBlock *idom = immedDom (ebbs, ebbs[i]);
+	      eBBlock *idom = immedDom (ebbi, ebbs[i]);
 	      if (idom)
 		addSetHead (&pred, idom);
 	    }
-
+          
 	  /* figure out the incoming expressions */
 	  /* this is a little more complex       */
-	  setToNull ((void **) &ebbs[i]->inExprs);
+	  setToNull ((void *) &ebbs[i]->inExprs);
 	  if (optimize.global_cse)
 	    {
 	      firstTime = 1;
 	      applyToSet (pred, mergeInExprs, ebbs[i], &firstTime);
 	    }
-	  setToNull ((void **) &pred);
+	  setToNull ((void *) &pred);
 
 	  /* do cse with computeOnly flag set to TRUE */
 	  /* this by far the quickest way of computing */
-	  cseBBlock (ebbs[i], TRUE, ebbs, count);
+	  cseBBlock (ebbs[i], TRUE, ebbi);
 
 	  /* if it change we will need to iterate */
-	  change += !isSetsEqualWith (ebbs[i]->outExprs, oldOut, isCseDefEqual);
+	  if (optimize.global_cse)
+            {
+	      change += !isSetsEqualWith (ebbs[i]->outExprs, oldOutExprs, isCseDefEqual);
+              change += !isSetsEqualWith (ebbs[i]->killedExprs, oldKilledExprs, isCseDefEqual);
+            }
+	  change += !bitVectEqual (ebbs[i]->outDefs, oldOutDefs);
 	}
 
-      if (!change)		/* iterate till no change */
-	break;
+      if (!change)	/* iterate till no change */
+        break;
     }
 
   return;
@@ -321,7 +347,7 @@ usedInRemaining (operand * op, iCode * ic)
 	  if (lic->op == CALL) {
 	    args=FUNC_ARGS(OP_SYMBOL(IC_LEFT(lic))->type);
 	  } else {
-	    args=FUNC_ARGS(OP_SYMBOL(IC_LEFT(lic))->type->next);
+	    args=FUNC_ARGS(operandType(IC_LEFT(lic))->next);
 	  }
 	  if ((IS_PARM (op) &&
 	       isParameterToCall (args, op)) ||