changes

diff --git a/Robust/src/Analysis/TaskStateAnalysis/ObjWrapper.java b/Robust/src/Analysis/TaskStateAnalysis/ObjWrapper.java
index 3fe4b458d52fa9124357c76942fb2227553bb638..913b45b70e5a12e9360fb973dc5ba64e668cb512 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/ObjWrapper.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/ObjWrapper.java
@@ -5,12 +5,15 @@ import IR.Flat.*;
 import java.util.*;
 
 public class ObjWrapper implements Wrapper{
-    FlagState fs;
-    Vector<TagWrapper> tags;
+    Flagstate initfs;
+    HashSet<FlagState> fs;
+    HashSet<TagWrapper> tags;
 
     public ObjWrapper(FlagState fs) {
-       this.fs=fs;
-       tags=new Vector<TagWrapper>();
+       this.initfs=fs;
+       this.fs=new HashSet<FlagState>();
+       this.fs.add(fs);
+       tags=new HashSet<TagWrapper>();
     }
 
 }

diff --git a/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java
index f83c25888698f0ca09182c17ac47778d75f236ce..f8e2e54b4a3a850cca98fba2a7d520097407cf61 100644 (file)
--- a/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/TaskTagAnalysis.java
@@ -35,7 +35,6 @@ public class TaskTagAnalysis {
 
     private void doAnalysis() {
        toprocess.add(createInitialState());
-
        while(!toprocess.isEmpty()) {
            TagState ts=toprocess.iterator().next();
            toprocess.remove(ts);
@@ -128,19 +127,34 @@ public class TaskTagAnalysis {
     }
 
     private void processFlatFlag(FlatFlagActionNode fn, Hashtable<TempDescriptor, TagState> table) {
-
+       
     }
 
     private void processFlatCall(FlatCall fc, Hashtable<TempDescriptor, TagState> table) {
-
+       //Do nothing for now
     }
 
     private void processFlatReturnNode(FlatReturnNode fr, Hashtable<TempDescriptor, TagState> table) {
 
     }
 
-    private boolean equivalent(Hashtable<TempDescriptor, TagState> table1, Hashtable<TempDescriptor, TagState> table2) {
-
+    private boolean equivalent(Hashtable<TempDescriptor, Wrapper> table1, Hashtable<TempDescriptor, Wrapper> table2) {
+       Hashtable<Wrapper, Wrapper> emap=new Hashtable<Wrapper, Wrapper>;
+       for(Iterator<TempDescriptor> tmpit=table1.keySet().iterator();tmpit.hasNext();) {
+           TempDescriptor tmp=tmpit.next();
+           if (table2.containsKey(tmp)) {
+               emap.put(table1.get(tmp), table2.get(tmp));
+           } else return false;
+       }
+       for(Iterator<TempDescriptor> tmpit=table2.keySet().iterator();tmpit.hasNext();) {
+           TempDescriptor tmp=tmpit.next();
+           if (table1.containsKey(tmp)) {
+               emap.put(table1.get(tmp), table2.get(tmp));
+           } else return false;
+       }
+       
+       for
+       
     }
 
     private void doAnalysis(TaskBinding tb) {
@@ -155,7 +169,7 @@ public class TaskTagAnalysis {
            FlatNode fn=tovisit.iterator().next();
            tovisit.remove(fn);
            visited.add(fn);
-           Hashtable<TempDescriptor, TagState> table=computeInitialState(wtable, fn);
+           Hashtable<TempDescriptor, Wrapper> table=computeInitialState(wtable, fn);
            switch(fn.kind()) {
            case FKind.FlatFlagActionNode:
                processFlatFlag((FlatFlagActionNode)fn, table);