From: bdemsky <bdemsky>
Date: Mon, 6 Aug 2007 09:12:02 +0000 (+0000)
Subject: more changes
X-Git-Tag: preEdgeChange~498
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=735692497e8280b73f1115977cf6bf7ef4e58195;p=IRC.git

more changes
---

diff --git a/Robust/src/IR/Flat/FKind.java b/Robust/src/IR/Flat/FKind.java
index 6ccc78c7..5fcaa557 100644
--- a/Robust/src/IR/Flat/FKind.java
+++ b/Robust/src/IR/Flat/FKind.java
@@ -20,5 +20,5 @@ public class FKind {
     public static final int FlatMethod=17;
     public static final int FlatAtomicEnterNode=18;
     public static final int FlatAtomicExitNode=19;
-    public static final int FlagGlobalConvNode=20;
+    public static final int FlatGlobalConvNode=20;
 }
diff --git a/Robust/src/IR/Flat/FlatGlobalConvNode.java b/Robust/src/IR/Flat/FlatGlobalConvNode.java
index 209233e9..ea61e84c 100644
--- a/Robust/src/IR/Flat/FlatGlobalConvNode.java
+++ b/Robust/src/IR/Flat/FlatGlobalConvNode.java
@@ -1,28 +1,33 @@
 package IR.Flat;
 import IR.TypeDescriptor;
+import Analysis.Locality.LocalityBinding;
 
 public class FlatGlobalConvNode extends FlatNode {
     TempDescriptor src;
-    TempDescriptor dst;
+    LocalityBinding lb;
     boolean makePtr;
 
-    public FlatGlobalConvNode(TempDescriptor src, TempDescriptor dst, boolean makePtr) {
+    public FlatGlobalConvNode(TempDescriptor src, LocalityBinding lb, boolean makePtr) {
 	this.src=src;
-	this.dst=dst;
+	this.lb=lb;
 	this.makePtr=makePtr;
     }
 
     public String toString() {
 	if (makePtr)
-	    return dst.toString()+"=(PTR)"+src.toString();
+	    return src.toString()+"=(PTR)"+src.toString()+" "+lb;
 	else
-	    return dst.toString()+"=(OID)"+src.toString();
+	    return src.toString()+"=(OID)"+src.toString()+" "+lb;
     }
 
     public int kind() {
 	return FKind.FlatGlobalConvNode;
     }
 
+    public LocalityBinding getLocality() {
+	return lb;
+    }
+
     public boolean getMakePtr() {
 	return makePtr;
     }
@@ -31,12 +36,8 @@ public class FlatGlobalConvNode extends FlatNode {
 	return src;
     }
 
-    public TempDescriptor getDst() {
-	return dst;
-    }
-
     public TempDescriptor [] writesTemps() {
-	return new TempDescriptor[] {dst};
+	return new TempDescriptor[] {src};
     }
 
     public TempDescriptor [] readsTemps() {
diff --git a/Robust/src/IR/Flat/FlatMethod.java b/Robust/src/IR/Flat/FlatMethod.java
index be3c8182..4f1e0c9f 100644
--- a/Robust/src/IR/Flat/FlatMethod.java
+++ b/Robust/src/IR/Flat/FlatMethod.java
@@ -73,12 +73,12 @@ public class FlatMethod extends FlatNode {
 
     /** This method returns a set of the nodes in this flat representation */
 
-    public Set getNodeSet() {
-	HashSet tovisit=new HashSet();
-	HashSet visited=new HashSet();
+    public Set<FlatNode> getNodeSet() {
+	HashSet<FlatNode> tovisit=new HashSet<FlatNode>();
+	HashSet<FlatNode> visited=new HashSet<FlatNode>();
 	tovisit.add(this);
 	while(!tovisit.isEmpty()) {
-	    FlatNode fn=(FlatNode)tovisit.iterator().next();
+	    FlatNode fn=tovisit.iterator().next();
 	    tovisit.remove(fn);
 	    visited.add(fn);
 	    for(int i=0;i<fn.numNext();i++) {
diff --git a/Robust/src/IR/Flat/FlatNode.java b/Robust/src/IR/Flat/FlatNode.java
index 6463fcab..b1780b10 100644
--- a/Robust/src/IR/Flat/FlatNode.java
+++ b/Robust/src/IR/Flat/FlatNode.java
@@ -31,6 +31,14 @@ public class FlatNode {
 	next.add(n);
 	n.addPrev(this);
     }
+
+    /** This function modifies the graph */
+    public void setNext(int i, FlatNode n) {
+	FlatNode old=getNext(i);
+	next.set(i, n);
+	old.prev.remove(this);
+    }
+
     protected void addPrev(FlatNode p) {
 	prev.add(p);
     }