fix sloppy code and use a more recognizable invalid pointer for mem pool

diff --git a/Robust/src/Benchmarks/oooJava/micro-master-makefile b/Robust/src/Benchmarks/oooJava/micro-master-makefile
index 307351bfea5b88b2811af3008e98954b5edd7a2a..7048a2aaf7cada85e5acf318db310fd65fb6c3ed 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/micro-master-makefile
+++ b/Robust/src/Benchmarks/oooJava/micro-master-makefile
@@ -32,8 +32,8 @@ USECOREPROF= #-coreprof $(COREPROFOVERFLOW) \
        -coreprof-enable cpe_taskstallmem
 
 
-USEOOO= -ooojava 8 2 #-ooodebug-disable-task-mem-pool #-ooodebug 
-BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 50 -garbagestats -joptimize -noloop -debug -debug-deque #-optimize src-after-pp
+USEOOO= -ooojava 24 2 -squeue -ooodebug-disable-task-mem-pool #-ooodebug 
+BSFLAGS= -64bit -mainclass $(PROGRAM)  -heapsize-mb 50 -garbagestats -joptimize -noloop -debug -debug-deque # -optimize src-after-pp
 
 DRELEASEMODE=-disjoint-release-mode -disjoint-dvisit-stack-callees-on-top -disjoint-alias-file aliases.txt tabbed
 DISJOINT= -disjoint -disjoint-k 1 -enable-assertions $(DRELEASEMODE) #-disjoint-desire-determinism

diff --git a/Robust/src/Benchmarks/oooJava/micro4/test.java b/Robust/src/Benchmarks/oooJava/micro4/test.java
index c47a32b780d54462b34d7415a4e36ab554491183..5465abe4c5f50ed5eba3b4c2931630426eddae77 100644 (file)
--- a/Robust/src/Benchmarks/oooJava/micro4/test.java
+++ b/Robust/src/Benchmarks/oooJava/micro4/test.java
@@ -50,11 +50,13 @@ public class test {
       }
 
       // force a coarse grained conflict
-      //array[numFoo - 1].f++;
-      
+      long z = 1;
+      for( int i = 0; i < numFoo; i++ ) {
+        z += array[i].f;
+      }
+
 
       e1 = System.currentTimeMillis();
-      long z = 1;
     }
     // just read vars so compile doesn't throw them out
     // and force parent of parent to depend on z, for

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index f309ad5bdba001c89525e78b0a0e30c83d1b179e..35ce9bccc5b7b256a688cbd104324913496e794e 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -2540,7 +2540,7 @@ public class BuildCode {
                      maxTaskRecSizeStr+" );");
     } else {
       // make it clear we purposefully did not initialize this
-      output.println("   runningSESE->taskRecordMemPool = (MemPool*)0x1;");
+      output.println("   runningSESE->taskRecordMemPool = (MemPool*)0x7;");
     }
     output.println( "#endif // OOO_DISABLE_TASKMEMPOOL" );
 
@@ -2652,7 +2652,7 @@ public class BuildCode {
     outmethod.println(      "  char errmsg[128];");
 
     // generate a case for each SESE class that can be invoked
-    outmethod.println(      "  switch( *((int*)seseRecord) ) {");
+    outmethod.println(      "  switch( ((SESEcommon*)seseRecord)->classID ) {");
     outmethod.println(      "    ");
     Iterator<FlatSESEEnterNode> seseit;
     if(state.MLP){