more code for state machines in dfj traversers

[IRC.git] / Robust / src / Analysis / Disjoint / EffectsAnalysis.java

diff --git a/Robust/src/Analysis/Disjoint/EffectsAnalysis.java b/Robust/src/Analysis/Disjoint/EffectsAnalysis.java
index 1ed85fa9eb946cbf653be9fa23af0665004e8df5..bb1331164151c6e445264beeaf860ef365a6c620 100644 (file)
--- a/Robust/src/Analysis/Disjoint/EffectsAnalysis.java
+++ b/Robust/src/Analysis/Disjoint/EffectsAnalysis.java
@@ -4,12 +4,8 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.io.*;
 
-import IR.FieldDescriptor;
-import IR.Flat.FlatCall;
-import IR.Flat.FlatMethod;
-import IR.Flat.FlatNode;
-import IR.Flat.TempDescriptor;
-import IR.Flat.FlatSESEEnterNode;
+import IR.*;
+import IR.Flat.*;
 
 /////////////////////////////////////////////
 // 
@@ -39,6 +35,9 @@ public class EffectsAnalysis {
   private Hashtable<FlatSESEEnterNode, Hashtable<Taint, Set<Effect>> > sese2te;
   private Hashtable<FlatNode,          Hashtable<Taint, Set<Effect>> > stallSite2te;
 
+  public static State              state;
+  public static BuildStateMachines buildStateMachines;
+
 
   public EffectsAnalysis() {
     taint2effects = new Hashtable<Taint, Set<Effect>>();
@@ -59,73 +58,16 @@ public class EffectsAnalysis {
     return taint2effects.entrySet().iterator();
   }
 
-  /*
-  public Hashtable<Taint, Set<Effect>> getSESEEffects(FlatSESEEnterNode sese){
-    
-    Hashtable<Taint, Set<Effect>> taint2Effects = new Hashtable<Taint, Set<Effect>>();
-    Iterator iter=iteratorTaintEffectPairs();
-    while (iter.hasNext()) {
-      Entry entry = (Entry) iter.next();
-      Taint taint = (Taint) entry.getKey();
-      Set<Effect> effects = (Set<Effect>) entry.getValue();
-      if (taint.getSESE().equals(sese)) {
-        Iterator<Effect> eIter = effects.iterator();
-        while (eIter.hasNext()) {
-          Effect effect = eIter.next();
-          if (taint.getSESE().equals(sese)) {
-            Set<Effect> effectSet = taint2Effects.get(taint);
-            if (effectSet == null) {
-              effectSet = new HashSet<Effect>();
-            }
-            effectSet.add(effect);
-            taint2Effects.put(taint, effectSet);
-          }
-        }
-      }
-    }
-    
-    return taint2Effects;
-    
-  }
-  */
-
-  public Hashtable<Taint, Set<Effect>> getStallSiteEffects(FlatNode fn, TempDescriptor td){
-    
-    Hashtable<Taint, Set<Effect>> taint2Effects = new Hashtable<Taint, Set<Effect>>();
-    Iterator iter=iteratorTaintEffectPairs();
-    while(iter.hasNext()){
-      Entry entry=(Entry)iter.next();
-      Taint taint=(Taint)entry.getKey();
-      Set<Effect> effects=(Set<Effect>)entry.getValue();
-      if(taint.getStallSite().equals(fn)){
-        Iterator<Effect> eIter=effects.iterator();        
-        while (eIter.hasNext()) {
-          Effect effect = eIter.next();
-          if( taint.getStallSite().equals(fn) && taint.getVar().equals(td) ){
-            Set<Effect> effectSet=taint2Effects.get(taint);
-            if(effectSet==null){
-              effectSet=new HashSet<Effect>();
-            }
-            effectSet.add(effect);
-            taint2Effects.put(taint, effectSet);
-          }
-        }
-      }
-    }
-    return taint2Effects; 
-  }
-
-
-  protected void add(Taint t, Effect e) {
-    if( t.getSESE() != null &&
-        t.getSESE().getIsCallerSESEplaceholder() ) {
-      return;
-    }
+  protected void add(Taint t, Effect e, FlatNode currentProgramPoint) {
 
     Taint tNoPreds = Canonical.changePredsTo( t,
                                               ReachGraph.predsEmpty
                                               );
 
+    if( state.RCR ) {
+      buildStateMachines.addToStateMachine( t, e, currentProgramPoint );
+    }
+
     // add to the global bag
     Set<Effect> effectSet = taint2effects.get(tNoPreds);
     if (effectSet == null) {
@@ -167,7 +109,6 @@ public class EffectsAnalysis {
       }
       effects.add(e);
       te.put(tNoPreds, effects);
-
       stallSite2te.put(stallSite, te);
     }    
   }
@@ -183,7 +124,7 @@ public class EffectsAnalysis {
 
 
 
-  public void analyzeFlatFieldNode(ReachGraph rg, TempDescriptor rhs, FieldDescriptor fld) {
+  public void analyzeFlatFieldNode(ReachGraph rg, TempDescriptor rhs, FieldDescriptor fld, FlatNode currentProgramPoint) {
 
     VariableNode vn = rg.td2vn.get(rhs);
     if( vn == null ) {
@@ -198,12 +139,12 @@ public class EffectsAnalysis {
 
       for (Iterator<Taint> taintSetIter = taintSet.iterator(); taintSetIter.hasNext();) {
         Taint taint = taintSetIter.next();        
-        add(taint, effect);
+        add(taint, effect, currentProgramPoint);
       }
     }
   }
 
-  public void analyzeFlatSetFieldNode(ReachGraph rg, TempDescriptor lhs, FieldDescriptor fld, boolean strongUpdate) {
+  public void analyzeFlatSetFieldNode(ReachGraph rg, TempDescriptor lhs, FieldDescriptor fld, FlatNode currentProgramPoint, boolean strongUpdate) {
 
     VariableNode vn = rg.td2vn.get(lhs);
     if( vn == null ) {
@@ -223,10 +164,10 @@ public class EffectsAnalysis {
 
       for (Iterator<Taint> taintSetIter = taintSet.iterator(); taintSetIter.hasNext();) {
         Taint taint = taintSetIter.next();
-        add( taint, effect );
+        add( taint, effect, currentProgramPoint );
 
         if (strongUpdate) {
-          add( taint, effectSU );
+          add( taint, effectSU, currentProgramPoint );
         }
       }
     }
@@ -348,4 +289,8 @@ public class EffectsAnalysis {
    * 
    * }
    */
+  
+  public Hashtable<Taint, Set<Effect>> getAllEffects() {
+    return taint2effects;
+  }
 }