From: bdemsky <bdemsky>
Date: Fri, 4 Aug 2006 23:00:52 +0000 (+0000)
Subject: rewrite flags in DNF form
X-Git-Tag: preEdgeChange~856
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=95701add85a22544e2e8514ba64fe17bb71d035f;p=IRC.git

rewrite flags in DNF form
---

diff --git a/Robust/src/IR/Tree/DNFFlag.java b/Robust/src/IR/Tree/DNFFlag.java
new file mode 100644
index 00000000..67cdd3c2
--- /dev/null
+++ b/Robust/src/IR/Tree/DNFFlag.java
@@ -0,0 +1,88 @@
+package IR.Tree;
+import java.util.Vector;
+import IR.*;
+
+public class DNFFlag {
+    Vector conjunctions;
+    public DNFFlag(FlagNode flag) {
+	DNFFlagAtom dfa=new DNFFlagAtom(flag, false);
+	conjunctions=new Vector();
+	Vector conjunct=new Vector();
+	conjunct.add(dfa);
+	conjunctions.add(conjunct);
+    }
+    private DNFFlag() {
+	conjunctions=new Vector();
+    }
+
+    /** This method negates a DNFFlag expression. */
+
+    public DNFFlag not() {
+        DNFFlag notflag=null;
+        for (int i=0;i<conjunctions.size();i++) {
+            Vector conj=(Vector)conjunctions.get(i);
+            DNFFlag newflag=null;
+            for (int j=0;j<conj.size();j++) {
+                DNFFlagAtom dfa=(DNFFlagAtom) conj.get(j);
+		DNFFlagAtom negdfa=new DNFFlagAtom(dfa.flag,!dfa.negated);
+		DNFFlag tmp=new DNFFlag();
+		Vector v=new Vector();
+		tmp.conjunctions.add(v);
+		v.add(negdfa);
+
+                if (newflag==null)
+		    newflag=tmp;
+                else
+                   newflag=newflag.or(tmp);
+            }
+            if (notflag==null)
+		notflag=newflag;
+            else
+		notflag=notflag.and(newflag);
+        }
+        return notflag;
+    }
+
+    /** This method or's two DNFFlag expressions together. */
+    public DNFFlag or(DNFFlag dnf2) {
+	DNFFlag result=new DNFFlag();
+	for(int i=0;i<conjunctions.size();i++) {
+	    Vector conjunct=(Vector)conjunctions.get(i);
+	    Vector newvector=new Vector();
+	    result.conjunctions.add(newvector);
+	    for(int j=0;j<conjunct.size();j++) {
+		newvector.add(conjunct.get(j));
+	    }
+	}
+
+	for(int i=0;i<dnf2.conjunctions.size();i++) {
+	    Vector conjunct=(Vector)dnf2.conjunctions.get(i);
+	    Vector newvector=new Vector();
+	    result.conjunctions.add(newvector);
+	    for(int j=0;j<conjunct.size();j++) {
+		newvector.add(conjunct.get(j));
+	    }
+	}
+	return result;
+    }
+
+    /** This method and's two DNFFlag expressions together. */
+    public DNFFlag and(DNFFlag dnf2) {
+	DNFFlag result=new DNFFlag();
+	for(int i=0;i<conjunctions.size();i++) {
+	    for(int i2=0;i2<dnf2.conjunctions.size();i2++) {
+		Vector conjunct=(Vector)conjunctions.get(i);
+		Vector conjunct2=(Vector)conjunctions.get(i2);
+		Vector newconjunct=new Vector();
+		result.conjunctions.add(newconjunct);
+		for(int j=0;j<conjunct.size();j++) {
+		    newconjunct.add(conjunct.get(j));
+		}
+		for(int j2=0;j2<conjunct2.size();j2++) {		
+		    newconjunct.add(conjunct2.get(j2));
+		}
+	    }
+	}
+	return result;
+    }
+}
diff --git a/Robust/src/IR/Tree/DNFFlagAtom.java b/Robust/src/IR/Tree/DNFFlagAtom.java
new file mode 100644
index 00000000..e1fd3cce
--- /dev/null
+++ b/Robust/src/IR/Tree/DNFFlagAtom.java
@@ -0,0 +1,13 @@
+package IR.Tree;
+
+import IR.*;
+
+public class DNFFlagAtom {
+    final FlagNode flag;
+    final boolean negated;
+
+    public DNFFlagAtom(FlagNode flag, boolean negated) {
+	this.flag=flag;
+	this.negated=negated;
+    }
+}
diff --git a/Robust/src/IR/Tree/FlagExpressionNode.java b/Robust/src/IR/Tree/FlagExpressionNode.java
index 6d27547f..b00c8fe1 100644
--- a/Robust/src/IR/Tree/FlagExpressionNode.java
+++ b/Robust/src/IR/Tree/FlagExpressionNode.java
@@ -5,4 +5,8 @@ public class FlagExpressionNode extends TreeNode {
     public String printNode(int indentlevel) {
 	return null;
     }
+
+    public DNFFlag getDNF() {
+	throw new Error();
+    }
 }
diff --git a/Robust/src/IR/Tree/FlagNode.java b/Robust/src/IR/Tree/FlagNode.java
index 7b18b7f5..68f2b2b4 100644
--- a/Robust/src/IR/Tree/FlagNode.java
+++ b/Robust/src/IR/Tree/FlagNode.java
@@ -1,4 +1,5 @@
 package IR.Tree;
+import java.util.Vector;
 
 import IR.*;
 
@@ -29,4 +30,8 @@ public class FlagNode extends FlagExpressionNode {
     public String printNode(int indent) {
 	return name;
     }
+
+    public DNFFlag getDNF() {
+	return new DNFFlag(this);
+    }
 }
diff --git a/Robust/src/IR/Tree/FlagOpNode.java b/Robust/src/IR/Tree/FlagOpNode.java
index 5ce57484..558ebabb 100644
--- a/Robust/src/IR/Tree/FlagOpNode.java
+++ b/Robust/src/IR/Tree/FlagOpNode.java
@@ -40,4 +40,17 @@ public class FlagOpNode extends FlagExpressionNode {
     public int kind() {
 	return Kind.FlagOpNode;
     }
+
+    public DNFFlag getDNF() {
+	DNFFlag leftflag=left.getDNF();
+	DNFFlag rightflag=right!=null?right.getDNF():null;
+
+	if (op.getOp()==Operation.LOGIC_NOT) {
+	    return leftflag.not();
+	} else if (op.getOp()==Operation.LOGIC_OR) {
+	    return leftflag.or(rightflag);
+	} else if (op.getOp()==Operation.LOGIC_AND) {
+	    return leftflag.and(rightflag);
+	} else throw new Error();
+    }
 }