From: bdemsky <bdemsky>
Date: Wed, 17 May 2006 05:10:30 +0000 (+0000)
Subject: Code to keep track of flags in flat ir
X-Git-Tag: preEdgeChange~882
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bf38aefdaafef20f6ce7910b2a09eb76e6ff59d5;p=IRC.git

Code to keep track of flags in flat ir
---

diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java
index 471b5fe0..7cead58f 100644
--- a/Robust/src/IR/Flat/BuildFlat.java
+++ b/Robust/src/IR/Flat/BuildFlat.java
@@ -33,14 +33,34 @@ public class BuildFlat {
     private void flattenTask(TaskDescriptor td) {
 	BlockNode bn=state.getMethodBody(td);
 	FlatNode fn=flattenBlockNode(bn).getBegin();
-	FlatMethod fm=new FlatMethod(td, fn);
+	FlatFlagActionNode ffan=new FlatFlagActionNode();
+	ffan.addNext(fn);
+	FlatMethod fm=new FlatMethod(td, ffan);
 
 	for(int i=0;i<td.numParameters();i++) {
 	    fm.addParameterTemp(getTempforVar(td.getParameter(i)));
 	}
+
+	/* Flatten Vector of Flag Effects */
+	Vector flags=td.getFlagEffects();
+	updateFlagActionNode(ffan,flags);
+
 	state.addFlatCode(td,fm);
     }
 
+
+    /* This method transforms a vector of FlagEffects into the FlatFlagActionNode */
+    private void updateFlagActionNode(FlatFlagActionNode ffan, Vector flags) {
+	for(int i=0;i<flags.size();i++) {
+	    FlagEffects fes=(FlagEffects)flags.get(i);
+	    TempDescriptor flagtemp=getTempforVar(fes.getVar());
+	    for(int j=0;j<fes.numEffects();j++) {
+		FlagEffect fe=fes.getEffect(j);
+		ffan.addFlagAction(flagtemp, fe.getFlag(), fe.getStatus());
+	    }
+	}
+    }
+
     private void flattenClass(ClassDescriptor cn) {
 	Iterator methodit=cn.getMethods();
 	while(methodit.hasNext()) {
diff --git a/Robust/src/IR/Flat/FKind.java b/Robust/src/IR/Flat/FKind.java
index 292ed678..b15035c7 100644
--- a/Robust/src/IR/Flat/FKind.java
+++ b/Robust/src/IR/Flat/FKind.java
@@ -14,4 +14,5 @@ public class FKind {
     public static final int FlatSetElementNode=11;
     public static final int FlatElementNode=12;
     public static final int FlatTaskExitNode=13;
+    public static final int FlatFlagActionNode=14;
 }
diff --git a/Robust/src/IR/Flat/FlatFlagActionNode.java b/Robust/src/IR/Flat/FlatFlagActionNode.java
new file mode 100644
index 00000000..39994ac2
--- /dev/null
+++ b/Robust/src/IR/Flat/FlatFlagActionNode.java
@@ -0,0 +1,38 @@
+package IR.Flat;
+import IR.FlagDescriptor;
+import java.util.Hashtable;
+import java.util.HashSet;
+import java.util.Iterator;
+
+public class FlatFlagActionNode extends FlatNode {
+    Hashtable tempflagpairs; 
+
+    public FlatFlagActionNode() {
+	tempflagpairs=new Hashtable();
+    }
+
+    public void addFlagAction(TempDescriptor td, FlagDescriptor fd, boolean status) {
+	TempFlagPair tfp=new TempFlagPair(td,fd);
+	if (tempflagpairs.containsKey(tfp)) {
+	    throw new Error("Temp/Flag combination used twice: "+tfp);
+	}
+	tempflagpairs.put(tfp, new Boolean(status));
+    }
+
+    public int kind() {
+        return FKind.FlatFlagActionNode;
+    }
+
+    public TempDescriptor [] readsTemps() {
+        if (tempflagpairs.size()==0)
+            return new TempDescriptor [0];
+        else {
+	    HashSet temps=new HashSet();
+	    for(Iterator it=tempflagpairs.keySet().iterator();it.hasNext();) {
+		TempFlagPair tfp=(TempFlagPair)it.next();
+		temps.add(tfp.getTemp());
+	    }
+            return (TempDescriptor[]) temps.toArray(new TempDescriptor [temps.size()]);
+	}
+    }
+}
diff --git a/Robust/src/IR/Flat/FlatTaskExitNode.java b/Robust/src/IR/Flat/FlatTaskExitNode.java
index c13d9ebd..fee0f33d 100644
--- a/Robust/src/IR/Flat/FlatTaskExitNode.java
+++ b/Robust/src/IR/Flat/FlatTaskExitNode.java
@@ -7,8 +7,4 @@ public class FlatTaskExitNode extends FlatNode {
     public int kind() {
 	return FKind.FlatTaskExitNode;
     }
-
-    public TempDescriptor [] readsTemps() {
-	return new TempDescriptor [0];
-    }
 }
diff --git a/Robust/src/IR/Tree/FlagEffect.java b/Robust/src/IR/Tree/FlagEffect.java
index 78769103..8bc1c43e 100644
--- a/Robust/src/IR/Tree/FlagEffect.java
+++ b/Robust/src/IR/Tree/FlagEffect.java
@@ -28,6 +28,10 @@ public class FlagEffect {
 	return Kind.FlagNode;
     }
 
+    public boolean getStatus() {
+	return status;
+    }
+
     public String printNode(int indent) {
 	if (status)
 	    return name;