reorganize stall code

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 732e5a830ab39a08211915e780aee58151b9ce9a..6b1e0d066e37d3bdcb46e11ca8aa629673112571 100644 (file)
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -3125,6 +3125,8 @@ public class BuildCode {
     output.println("     stallrecord->rcrRecords[0].flag=0;");
     output.println("     stallrecord->rcrRecords[0].next=NULL;");
     output.println("     stallrecord->common.parentsStallSem=&runningSESEstallSem;");
+    output.println("     psem_reset( &runningSESEstallSem);");
+    output.println("     stallrecord->tag=runningSESEstallSem.tag;");
 
     TempDescriptor stalltd=null;
     for (Iterator iterator = waitingElementSet.iterator(); iterator.hasNext();) {
@@ -3136,10 +3138,6 @@ public class BuildCode {
       } else {
        throw new Error("Fine-grained conflict: This should not happen in RCR");
       }
-      output.println("     rentry->parentStallSem=&runningSESEstallSem;");
-      output.println("     psem_reset( &runningSESEstallSem);");
-      output.println("     rentry->tag=runningSESEstallSem.tag;");
-      output.println("     stallrecord->tag=rentry->tag;");
       output.println("     rentry->queue=runningSESE->memoryQueueArray["
                     + waitingElement.getQueueID() + "];");
       output.println("     if(ADDRENTRY(runningSESE->memoryQueueArray["