* device/include/pic16/pic18f*.h: add bit aliases in INTCONbits_t

[fw/sdcc] / src / SDCCdflow.c

diff --git a/src/SDCCdflow.c b/src/SDCCdflow.c
index 3b3f8dd1438428bd3ac86d6fb5604938f4356be4..a45eb174b19f702ddf294e622eb0dd5153a6113b 100644 (file)
--- a/src/SDCCdflow.c
+++ b/src/SDCCdflow.c
@@ -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                     */
 /*-----------------------------------------------------------------*/
@@ -156,14 +165,18 @@ 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 */
@@ -172,6 +185,7 @@ computeDataFlow (eBBlock ** ebbs, int count)
 
          set *pred;
          set *oldOutExprs = NULL;
+         set *oldKilledExprs = NULL;
           bitVect *oldOutDefs = NULL;
          int firstTime;
          eBBlock *pBlock;
@@ -184,12 +198,14 @@ computeDataFlow (eBBlock ** ebbs, int count)
          /* get blocks that can come to this block */
          pred = edgesTo (ebbs[i]);
 
-         /* make a copy of the outExpressions or outDefs : to be */
+         /* make a copy of the outExpressions and outDefs : to be */
          /* used for iteration   */
          if (optimize.global_cse)
-           oldOutExprs = setFromSet (ebbs[i]->outExprs);
-         else
-           oldOutDefs = bitVectCopy (ebbs[i]->outDefs);
+            {
+             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 */
@@ -211,11 +227,11 @@ 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);
@@ -228,17 +244,19 @@ computeDataFlow (eBBlock ** ebbs, int count)
 
          /* 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 */
          if (optimize.global_cse)
-           change += !isSetsEqualWith (ebbs[i]->outExprs, oldOutExprs, isCseDefEqual);
-         else
-           change += !bitVectEqual (ebbs[i]->outDefs, oldOutDefs);
+            {
+             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;