From: bdemsky <bdemsky>
Date: Mon, 6 Aug 2007 09:16:11 +0000 (+0000)
Subject: make sure it builds
X-Git-Tag: preEdgeChange~497
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=75efce298ec75db8c4e3eb7444c385e2297934b1;p=IRC.git

make sure it builds
---

diff --git a/Robust/src/Analysis/Locality/LocalityAnalysis.java b/Robust/src/Analysis/Locality/LocalityAnalysis.java
index cfcbd184..201e8a40 100644
--- a/Robust/src/Analysis/Locality/LocalityAnalysis.java
+++ b/Robust/src/Analysis/Locality/LocalityAnalysis.java
@@ -1,11 +1,6 @@
 package Analysis.Locality;
 
-import java.util.Hashtable;
-import java.util.Stack;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Arrays;
+import java.util.*;
 import Analysis.CallGraph.CallGraph;
 import IR.SymbolTable;
 import IR.State;
@@ -386,7 +381,6 @@ public class LocalityAnalysis {
 	while(!toprocess.isEmpty()) {
 	    FlatNode fn=toprocess.iterator().next();
 	    toprocess.remove(fn);
-	    boolean isatomic=atomictab.get(fn).intValue()>0;
 
 	    List<TempDescriptor> reads=Arrays.asList(fn.readsTemps());
 	    List<TempDescriptor> writes=Arrays.asList(fn.readsTemps());
@@ -402,7 +396,7 @@ public class LocalityAnalysis {
 	    if (!nodetotemps.containsKey(fn)||
 		nodetotemps.get(fn).equals(tempset)) {
 		nodetotemps.put(fn, tempset);
-		for(int i=0;i<fn.numPrev(i);i++)
+		for(int i=0;i<fn.numPrev();i++)
 		    toprocess.add(fn.getPrev(i));
 	    }
 	}
@@ -424,7 +418,7 @@ public class LocalityAnalysis {
 	MethodDescriptor md=lb.getMethod();
 	FlatMethod fm=state.getMethodFlat(md);
 
-	Hashtable<FlatNode, Set<TempDescriptor>> nodetotemps=computeLiveTemps(md);
+	Hashtable<FlatNode, Set<TempDescriptor>> nodetotemps=computeLiveTemps(fm);
 	
 
     }
diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java
index 5baf372c..eb02c49c 100644
--- a/Robust/src/IR/State.java
+++ b/Robust/src/IR/State.java
@@ -62,6 +62,7 @@ public class State {
     private int numtasks=0;
     private int arraycount=0;
 
+
     private Hashtable analysisresult;
     private Hashtable myoptionals;
 
diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java
index 7e9e4c56..fa7a78dd 100644
--- a/Robust/src/Main/Main.java
+++ b/Robust/src/Main/Main.java
@@ -18,6 +18,7 @@ import Analysis.TaskStateAnalysis.GarbageAnalysis;
 import Analysis.TaskStateAnalysis.ExecutionGraph;
 import Analysis.TaskStateAnalysis.SafetyAnalysis;
 import Analysis.Locality.LocalityAnalysis;
+import Analysis.Locality.GenerateConversions;
 import Interface.*;
 
 public class Main {
@@ -155,6 +156,7 @@ public class Main {
       if (state.DSM) {
 	  CallGraph callgraph=new CallGraph(state);
 	  LocalityAnalysis la=new LocalityAnalysis(state, callgraph, tu);
+	  GenerateConversions gc=new GenerateConversions(la, state);
       }
 
       BuildCode bc=new BuildCode(state, bf.getMap(), tu);