From 73459df8a9538c17e1ac2caabdd095061546ff31 Mon Sep 17 00:00:00 2001 From: bdemsky Date: Sat, 2 Apr 2011 03:38:01 +0000 Subject: [PATCH] bug fix for yeom...can you try to see if power works now? --- Robust/src/IR/Flat/RuntimeConflictResolver.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Robust/src/IR/Flat/RuntimeConflictResolver.java b/Robust/src/IR/Flat/RuntimeConflictResolver.java index 23234aba..03d78172 100644 --- a/Robust/src/IR/Flat/RuntimeConflictResolver.java +++ b/Robust/src/IR/Flat/RuntimeConflictResolver.java @@ -44,8 +44,8 @@ public class RuntimeConflictResolver { // initializing variables can be found in printHeader() private static final String allocSite = "allocsite"; - private static final String queryAndAddToVistedHashtable = "hashRCRInsert"; - private static final String enqueueInC = "enqueueRCRQueue("; + private static final String queryAndAddToVisitedHashtable = "hashRCRInsert"; + private static final String enqueueInC = "enqueueRCRQueue"; private static final String dequeueFromQueueInC = "dequeueRCRQueue()"; private static final String clearQueue = "resetRCRQueue()"; // Make hashtable; hashRCRCreate(unsigned int size, double loadfactor) @@ -153,7 +153,7 @@ public class RuntimeConflictResolver { //generic cast to ___Object___ to access ptr->allocsite field. cFile.println(" struct ___Object___ * ptr = (struct ___Object___ *) InVar;"); cFile.println(" if (InVar != NULL) {"); - cFile.println(" " + queryAndAddToVistedHashtable + "(ptr, "+initialState.getID()+");"); + cFile.println(" " + queryAndAddToVisitedHashtable + "(ptr, "+initialState.getID()+");"); cFile.println(" do {"); if( !isStallSite ) { @@ -300,7 +300,9 @@ public class RuntimeConflictResolver { cFile.println(" }"); //break for internal switch and if } else { //non-inlineable cases - cFile.println(" " + enqueueInC + childPtr + ", "+tr.getID()+");"); + cFile.println(" "+currPtr+"= (struct ___Object___ * ) " + childPtr + ";"); + cFile.println(" if("+queryAndAddToVisitedHashtable+"("+currPtr+","+tr.getID()+"))"); + cFile.println(" " + enqueueInC +"("+ currPtr + ", "+tr.getID()+");"); } } } -- 2.34.1