From 31d75680e8e88360b032ba965e4e64c886071cc4 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Tue, 11 Sep 2007 04:29:17 +0000
Subject: [PATCH] make simple example work

---
 Robust/src/Analysis/Locality/GenerateConversions.java    | 6 +++---
 Robust/src/Analysis/Locality/LocalityAnalysis.java       | 9 ++++-----
 .../src/Analysis/TaskStateAnalysis/SafetyAnalysis.java   | 1 -
 Robust/src/IR/Flat/BuildCode.java                        | 2 --
 Robust/src/Makefile                                      | 2 +-
 Robust/src/Runtime/ObjectHash.c                          | 9 ---------
 6 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/Robust/src/Analysis/Locality/GenerateConversions.java b/Robust/src/Analysis/Locality/GenerateConversions.java
index 74bfe1e7..d31265e4 100644
--- a/Robust/src/Analysis/Locality/GenerateConversions.java
+++ b/Robust/src/Analysis/Locality/GenerateConversions.java
@@ -51,7 +51,7 @@ public class GenerateConversions {
 	    Hashtable<TempDescriptor, Integer> nodetemptab=temptab.get(fn);
 	    
 	    List<TempDescriptor> reads=Arrays.asList(fn.readsTemps());
-	    List<TempDescriptor> writes=Arrays.asList(fn.readsTemps());
+	    List<TempDescriptor> writes=Arrays.asList(fn.writesTemps());
 
 	    if (!isatomic&&fn.kind()==FKind.FlatAtomicExitNode
 		&&!nodetoconvs.containsKey(fn))
@@ -78,7 +78,8 @@ public class GenerateConversions {
 			    TempNodePair tnp2=new TempNodePair(tnp.getTemp());
 			    tnp2.setNode(fn);
 			    tempset.add(tnp2);
-			}
+			} else
+			    tempset.add(tnp);
 		    } else
 			tempset.add(tnp);
 		}
@@ -118,7 +119,6 @@ public class GenerateConversions {
 		atomictab.get(fn.getPrev(0)).intValue()>0) {
 		//sanity check
 		assert(fn.kind()==FKind.FlatAtomicExitNode);
-
 		//insert calls here...
 		Set<TempDescriptor> tempset=nodetoconvs.get(fn);
 		for(Iterator<TempDescriptor> tempit=tempset.iterator();tempit.hasNext();) {
diff --git a/Robust/src/Analysis/Locality/LocalityAnalysis.java b/Robust/src/Analysis/Locality/LocalityAnalysis.java
index 60695a26..6a6c13cd 100644
--- a/Robust/src/Analysis/Locality/LocalityAnalysis.java
+++ b/Robust/src/Analysis/Locality/LocalityAnalysis.java
@@ -68,8 +68,8 @@ public class LocalityAnalysis {
 	    if (thistype==null)
 		thistype=EITHER;
 	    lb.setGlobalThis(thistype);
-	} else
-	    lb.setGlobalThis(EITHER);//default value
+	}// else
+	// lb.setGlobalThis(EITHER);//default value
 	if (discovered.containsKey(lb))
 	    lb=discovered.get(lb);
 	else throw new Error();
@@ -172,7 +172,6 @@ public class LocalityAnalysis {
 	}
     }
 
-
     public void computeCallsFlags(MethodDescriptor md, LocalityBinding lb, Hashtable<FlatNode, Hashtable<TempDescriptor, Integer>> temptable, Hashtable<FlatNode, Integer> atomictable) {
 	FlatMethod fm=state.getMethodFlat(md);
 	HashSet<FlatNode> tovisit=new HashSet<FlatNode>();
@@ -329,8 +328,8 @@ public class LocalityAnalysis {
 		if (isnative&&thistype.equals(GLOBAL))
 		    throw new Error("Potential call to native method "+md+" on global objects:\n"+currlb.getExplanation());
 		lb.setGlobalThis(thistype);
-	    } else
-		lb.setGlobalThis(EITHER);//default value
+	    } //else
+	    //lb.setGlobalThis(EITHER);//default value
 		
 	    //lb is built
 	    if (!discovered.containsKey(lb)) {
diff --git a/Robust/src/Analysis/TaskStateAnalysis/SafetyAnalysis.java b/Robust/src/Analysis/TaskStateAnalysis/SafetyAnalysis.java
index 1db990f1..3a999b4a 100644
--- a/Robust/src/Analysis/TaskStateAnalysis/SafetyAnalysis.java
+++ b/Robust/src/Analysis/TaskStateAnalysis/SafetyAnalysis.java
@@ -186,7 +186,6 @@ public class SafetyAnalysis {
     }
 
     private void printTEST(){
-	
 	Enumeration e = safeexecution.keys();
 	while (e.hasMoreElements()) {
 	    ClassDescriptor cdtemp=(ClassDescriptor)e.nextElement();
diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 4a8d628b..e636a025 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -2117,8 +2117,6 @@ public class BuildCode {
 	 
 	 headers.println("extern struct classanalysiswrapper * classanalysiswrapperarray[];");
 
-	
-
 	 Iterator taskit=state.getTaskSymbolTable().getDescriptorsIterator();
 	 while(taskit.hasNext()) {
 	     TaskDescriptor td=(TaskDescriptor)taskit.next();
diff --git a/Robust/src/Makefile b/Robust/src/Makefile
index 1a8c70de..6112b03d 100644
--- a/Robust/src/Makefile
+++ b/Robust/src/Makefile
@@ -83,7 +83,7 @@ Interface/WebInterface.class
 all: Parse/Sym.class Parse/Parser.class $(CLASSFILES) javadoc
 
 wc:
-	wc Interface/*.java Analysis/*/*.java IR/*.java IR/*/*.java Lex/*.java Util/*.java
+	wc Interface/*.java Analysis/*/*.java IR/*.java IR/*/*.java Lex/*.java Util/*.java ClassLibrary/*.java
 
 wcrun:
 	wc Runtime/*.[c,h]
diff --git a/Robust/src/Runtime/ObjectHash.c b/Robust/src/Runtime/ObjectHash.c
index b3a42abe..cd7ad2dc 100755
--- a/Robust/src/Runtime/ObjectHash.c
+++ b/Robust/src/Runtime/ObjectHash.c
@@ -129,15 +129,6 @@ int ObjectHashadd(struct ObjectHash * thisvar,int key, int data, int data2) {
   hashkey = (unsigned int)key % thisvar->size;
   ptr = &thisvar->bucket[hashkey];
 
-  while (*ptr) {
-    if ((*ptr)->key == key) {
-      (*ptr)->data=data;
-      (*ptr)->data2=data2;
-      return 1;
-    }
-    ptr = &((*ptr)->next);
-  }
-
   {
     struct ObjectNode *node=RUNMALLOC(sizeof(struct ObjectNode));
     node->data=data;
-- 
2.34.1