Bug fix in array initialization: handle the special case like {{null,null}}
[IRC.git] / Robust / src / IR / Flat / BuildCode.java
index 3ae8dca484bd87d183405bec4cbf330756df3081..d5f00a295f48889e41f6ae742f7d13f10814c8b5 100644 (file)
@@ -24,26 +24,11 @@ import Analysis.Locality.DCWrapper;
 import Analysis.Locality.DelayComputation;
 import Analysis.Locality.BranchAnalysis;
 import Analysis.CallGraph.CallGraph;
-import Analysis.Disjoint.AllocSite;
-import Analysis.Disjoint.Effect;
-import Analysis.Disjoint.ReachGraph;
-import Analysis.Disjoint.Taint;
-import Analysis.OoOJava.OoOJavaAnalysis;
 import Analysis.Prefetch.*;
 import Analysis.Loops.WriteBarrier;
 import Analysis.Loops.GlobalFieldType;
 import Analysis.Locality.TypeAnalysis;
-import Analysis.MLP.ConflictGraph;
-import Analysis.MLP.ConflictNode;
-import Analysis.MLP.MLPAnalysis;
-import Analysis.MLP.ParentChildConflictsMap;
-import Analysis.MLP.SESELock;
-import Analysis.MLP.SESEWaitingQueue;
-import Analysis.MLP.VariableSourceToken;
-import Analysis.MLP.VSTWrapper;
-import Analysis.MLP.CodePlan;
-import Analysis.MLP.SESEandAgePair;
-import Analysis.MLP.WaitingElement;
+import Util.CodePrinter;
 
 public class BuildCode {
   State state;
@@ -76,38 +61,27 @@ public class BuildCode {
   Hashtable<LocalityBinding, Hashtable<TempDescriptor, TempDescriptor>> backuptable;
   SafetyAnalysis sa;
   PrefetchAnalysis pa;
-  MLPAnalysis mlpa;
-  OoOJavaAnalysis oooa;
-  String maxTaskRecSizeStr="__maxTaskRecSize___";
-  String mlperrstr = "if(status != 0) { "+
-    "sprintf(errmsg, \"MLP error at %s:%d\", __FILE__, __LINE__); "+
-    "perror(errmsg); exit(-1); }";
-  boolean nonSESEpass=true;
-  RuntimeConflictResolver rcr = null;
   WriteBarrier wb;
   DiscoverConflicts dc;
   DiscoverConflicts recorddc;
   DCWrapper delaycomp;
   CallGraph callgraph;
+  Hashtable<String, ClassDescriptor> printedfieldstbl;
+  Hashtable<ClassDescriptor, Hashtable<String, ClassDescriptor>> cd2fieldstbl;
+  Hashtable<ClassDescriptor, Vector<FieldDescriptor>> cd2shadowfields;
 
 
   public BuildCode(State st, Hashtable temptovar, TypeUtil typeutil, SafetyAnalysis sa, PrefetchAnalysis pa) {
-    this(st, temptovar, typeutil, null, sa, pa, null, null);
+    this(st, temptovar, typeutil, null, sa, pa);
   }
 
-  public BuildCode(State st, Hashtable temptovar, TypeUtil typeutil, SafetyAnalysis sa, PrefetchAnalysis pa, MLPAnalysis mlpa, OoOJavaAnalysis oooa) {
-    this(st, temptovar, typeutil, null, sa, pa, mlpa, oooa);
+  public BuildCode(State st, Hashtable temptovar, TypeUtil typeutil, LocalityAnalysis locality, PrefetchAnalysis pa) {
+    this(st, temptovar, typeutil, locality, null, pa);
   }
 
-  public BuildCode(State st, Hashtable temptovar, TypeUtil typeutil, LocalityAnalysis locality, PrefetchAnalysis pa, MLPAnalysis mlpa, OoOJavaAnalysis oooa) {
-    this(st, temptovar, typeutil, locality, null, pa, mlpa, oooa);
-  }
-
-  public BuildCode(State st, Hashtable temptovar, TypeUtil typeutil, LocalityAnalysis locality, SafetyAnalysis sa, PrefetchAnalysis pa, MLPAnalysis mlpa, OoOJavaAnalysis oooa) {
+  public BuildCode(State st, Hashtable temptovar, TypeUtil typeutil, LocalityAnalysis locality, SafetyAnalysis sa, PrefetchAnalysis pa ) {
     this.sa=sa;
     this.pa=pa;
-    this.mlpa=mlpa;
-    this.oooa=oooa;
     state=st;
     callgraph=new CallGraph(state);
     if (state.SINGLETM)
@@ -140,6 +114,9 @@ public class BuildCode {
       recorddc=new DiscoverConflicts(locality, st, typeanalysis, delaycomp.getCannotDelayMap(), true, true, null);
       recorddc.doAnalysis();
     }
+    printedfieldstbl = new Hashtable<String, ClassDescriptor>();
+    cd2fieldstbl = new Hashtable<ClassDescriptor, Hashtable<String, ClassDescriptor>>();
+    cd2shadowfields = new Hashtable<ClassDescriptor, Vector<FieldDescriptor>>();
   }
 
   /** The buildCode method outputs C code for all the methods.  The Flat
@@ -163,27 +140,27 @@ public class BuildCode {
 
     try {
       if (state.SANDBOX) {
-       outsandbox=new PrintWriter(new FileOutputStream(PREFIX+"sandboxdefs.c"), true);
+       outsandbox=new CodePrinter(new FileOutputStream(PREFIX+"sandboxdefs.c"), true);
       }
-      outstructs=new PrintWriter(new FileOutputStream(PREFIX+"structdefs.h"), true);
-      outmethodheader=new PrintWriter(new FileOutputStream(PREFIX+"methodheaders.h"), true);
-      outclassdefs=new PrintWriter(new FileOutputStream(PREFIX+"classdefs.h"), true);
+      outstructs=new CodePrinter(new FileOutputStream(PREFIX+"structdefs.h"), true);
+      outmethodheader=new CodePrinter(new FileOutputStream(PREFIX+"methodheaders.h"), true);
+      outclassdefs=new CodePrinter(new FileOutputStream(PREFIX+"classdefs.h"), true);
       if(state.MGC) {
         // TODO add version for normal Java later
-      outglobaldefs=new PrintWriter(new FileOutputStream(PREFIX+"globaldefs.h"), true);
+      outglobaldefs=new CodePrinter(new FileOutputStream(PREFIX+"globaldefs.h"), true);
       }
-      outmethod=new PrintWriter(new FileOutputStream(PREFIX+"methods.c"), true);
-      outvirtual=new PrintWriter(new FileOutputStream(PREFIX+"virtualtable.h"), true);
+      outmethod=new CodePrinter(new FileOutputStream(PREFIX+"methods.c"), true);
+      outvirtual=new CodePrinter(new FileOutputStream(PREFIX+"virtualtable.h"), true);
       if (state.TASK) {
-       outtask=new PrintWriter(new FileOutputStream(PREFIX+"task.h"), true);
-       outtaskdefs=new PrintWriter(new FileOutputStream(PREFIX+"taskdefs.c"), true);
+       outtask=new CodePrinter(new FileOutputStream(PREFIX+"task.h"), true);
+       outtaskdefs=new CodePrinter(new FileOutputStream(PREFIX+"taskdefs.c"), true);
        if (state.OPTIONAL) {
-         outoptionalarrays=new PrintWriter(new FileOutputStream(PREFIX+"optionalarrays.c"), true);
-         optionalheaders=new PrintWriter(new FileOutputStream(PREFIX+"optionalstruct.h"), true);
+         outoptionalarrays=new CodePrinter(new FileOutputStream(PREFIX+"optionalarrays.c"), true);
+         optionalheaders=new CodePrinter(new FileOutputStream(PREFIX+"optionalstruct.h"), true);
        }
       }
       if (state.structfile!=null) {
-       outrepairstructs=new PrintWriter(new FileOutputStream(PREFIX+state.structfile+".struct"), true);
+       outrepairstructs=new CodePrinter(new FileOutputStream(PREFIX+state.structfile+".struct"), true);
       }
     } catch (Exception e) {
       e.printStackTrace();
@@ -217,22 +194,10 @@ public class BuildCode {
       outmethodheader.println("#include \"abortreaders.h\"");
       outmethodheader.println("#include <setjmp.h>");
     }
-    if (state.MLP || state.OOOJAVA) {
-      outmethodheader.println("#include <stdlib.h>");
-      outmethodheader.println("#include <stdio.h>");
-      outmethodheader.println("#include <string.h>");
-      outmethodheader.println("#include \"mlp_runtime.h\"");
-      outmethodheader.println("#include \"psemaphore.h\"");
-      outmethodheader.println("#include \"memPool.h\"");
 
-      if (state.RCR) {
-        outmethodheader.println("#include \"rcr_runtime.h\"");
-      }
 
-      // spit out a global to inform all worker threads with
-      // the maximum size is for any task record
-      outmethodheader.println("extern int "+maxTaskRecSizeStr+";");
-    }
+    additionalIncludesMethodsHeader( outmethodheader );
+
 
     /* Output Structures */
     outputStructs(outstructs);
@@ -286,66 +251,21 @@ public class BuildCode {
       outputTaskTypes(outtask);
     }
 
-    if( state.MLP || state.OOOJAVA) {      
-      // have to initialize some SESE compiler data before
-      // analyzing normal methods, which must happen before
-      // generating SESE internal code
-      
-      Iterator<FlatSESEEnterNode> seseit;
-      if(state.MLP){
-        seseit=mlpa.getAllSESEs().iterator();
-      }else{
-        seseit=oooa.getAllSESEs().iterator();
-      }
-      
-      //TODO signal the object that will report errors
-      if(state.RCR) {
-        try {
-          rcr = new RuntimeConflictResolver(PREFIX, oooa);
-          rcr.setGlobalEffects(oooa.getDisjointAnalysis().getEffectsAnalysis().getAllEffects());
-        } catch (FileNotFoundException e) {
-          System.out.println("Runtime Conflict Resolver could not create output file.");
-        }
-       rcr.init();
-      }
-      
-      while(seseit.hasNext()){
-        FlatSESEEnterNode fsen = seseit.next();
-        initializeSESE( fsen );
-      }
-    }
-
-    /* Build the actual methods */
-    outputMethods(outmethod);
 
-    // Output function prototypes and structures for SESE's and code
-    if( state.MLP || state.OOOJAVA ) {
+    // an opportunity for subclasses to do extra
+    // initialization
+    preCodeGenInitialization();
 
-      // spit out a global to inform all worker threads with
-      // the maximum size is for any task record
-      outmethod.println("int "+maxTaskRecSizeStr+" = 0;");
 
-      // used to differentiate, during code generation, whether we are
-      // passing over SESE body code, or non-SESE code
-      nonSESEpass = false;
+    /* Build the actual methods */
+    outputMethods(outmethod);
 
-      // first generate code for each sese's internals     
-      Iterator<FlatSESEEnterNode> seseit;
-      if(state.MLP){
-        seseit=mlpa.getAllSESEs().iterator();
-      }else{
-        seseit=oooa.getAllSESEs().iterator();
-      }
-      
-      while(seseit.hasNext()) {
-       FlatSESEEnterNode fsen = seseit.next();
-       generateMethodSESE(fsen, null, outstructs, outmethodheader, outmethod);
-      }
+    
+    // opportunity for subclasses to gen extra code
+    additionalCodeGen( outmethodheader,
+                       outstructs,
+                       outmethod );
 
-      // then write the invokeSESE switch to decouple scheduler
-      // from having to do unique details of sese invocation
-      generateSESEinvocationMethod(outmethodheader, outmethod);
-    }
 
     if (state.TASK) {
       /* Output code for tasks */
@@ -376,11 +296,13 @@ public class BuildCode {
     outmethod.close();
     outstructs.println("#endif");
     outstructs.close();
-    if(rcr != null) {
-      rcr.close();
-      System.out.println("Runtime Conflict Resolver Done.");
-    }
+
+
+
+    postCodeGenCleanUp();
   }
+
+
   
   /* This method goes though the call graph and tag those methods that are 
    * invoked inside static blocks
@@ -430,17 +352,7 @@ public class BuildCode {
    * */
   protected void outputClassObjects(PrintWriter outmethod) {
     // for each class, initialize its Class object
-    if(state.MGC) {
-      SymbolTable ctbl = this.state.getClassSymbolTable();
-      Iterator it_classes = ctbl.getDescriptorsIterator();
-      while(it_classes.hasNext()) {
-        ClassDescriptor t_cd = (ClassDescriptor)it_classes.next();
-        outmethod.println(" {");
-        outmethod.println("    global_defs_p->"+t_cd.getSafeSymbol()+"classobj.type="+t_cd.getId()+";");
-        outmethod.println("    initlock((struct ___Object___ *)(&(global_defs_p->"+t_cd.getSafeSymbol()+"classobj)));");
-        outmethod.println(" }");
-      }
-    } // else TODO normal java version
+    // TODO
   }
 
   /* This code just generates the main C method for java programs.
@@ -454,36 +366,9 @@ public class BuildCode {
     outputStaticBlocks(outmethod);
     outputClassObjects(outmethod);
 
-    if (state.MLP || state.OOOJAVA) {
-
-      // do a calculation to determine which task record
-      // is the largest, store that as a global value for
-      // allocating records
-      Iterator<FlatSESEEnterNode> seseit;
-      if(state.MLP){
-        seseit=mlpa.getAllSESEs().iterator();
-      }else{
-        seseit=oooa.getAllSESEs().iterator();
-      }      
-      while(seseit.hasNext()){
-        FlatSESEEnterNode fsen = seseit.next();
-        outmethod.println("if( sizeof( "+fsen.getSESErecordName()+
-                          " ) > "+maxTaskRecSizeStr+
-                          " ) { "+maxTaskRecSizeStr+
-                          " = sizeof( "+fsen.getSESErecordName()+
-                          " ); }" );
-      }
-      
-      outmethod.println("  runningSESE = NULL;");
 
-      outmethod.println("  workScheduleInit( "+state.MLP_NUMCORES+", invokeSESEmethod );");
-      
-      //initializes data structures needed for the RCR traverser
-      if(state.RCR && rcr != null) {
-        outmethod.println("  initializeStructsRCR();");
-        outmethod.println("  createAndFillMasterHashStructureArray();");
-      }
-    }
+    additionalCodeAtTopOfMain( outmethod );
+
 
     if (state.DSM) {
       if (state.DSMRECOVERYSTATS) {
@@ -601,9 +486,9 @@ public class BuildCode {
     if (state.THREAD||state.SINGLETM)
       outmethod.println("pthread_exit(NULL);");
 
-    if (state.MLP || state.OOOJAVA ) {
-      outmethod.println("  workScheduleBegin();");
-    }
+
+    additionalCodeAtBottomOfMain( outmethod );
+
 
     outmethod.println("}");
   }
@@ -639,11 +524,11 @@ public class BuildCode {
     outtaskdefs.println("int numtasks="+state.getTaskSymbolTable().getValueSet().size()+";");
   }
 
+
   /* This method outputs most of the methods.c file.  This includes
    * some standard includes and then an array with the sizes of
    * objets and array that stores supertype and then the code for
    * the Java methods.. */
-
   protected void outputMethods(PrintWriter outmethod) {
     outmethod.println("#include \"methodheaders.h\"");
     outmethod.println("#include \"virtualtable.h\"");
@@ -682,19 +567,10 @@ public class BuildCode {
     if (state.CONSCHECK) {
       outmethod.println("#include \"checkers.h\"");
     }
-    if (state.MLP || state.OOOJAVA ) {
-      outmethod.println("#include <stdlib.h>");
-      outmethod.println("#include <stdio.h>");
-      outmethod.println("#include \"mlp_runtime.h\"");
-      outmethod.println("#include \"psemaphore.h\"");
-      
-      if( state.RCR ) {
-        outmethod.println("#include \"trqueue.h\"");
-        outmethod.println("#include \"RuntimeConflictResolver.h\"");
-        outmethod.println("#include \"rcr_runtime.h\"");
-        outmethod.println("#include \"hashStructure.h\"");
-      }
-    }
+
+
+    additionalIncludesMethodsImplementation( outmethod );
+
 
     if(state.MGC) {
       // TODO add version for normal Java later
@@ -705,10 +581,20 @@ public class BuildCode {
 
     //Store table of supertypes
     generateSuperTypeTable(outmethod);
+    
+    // Store table of classnames
+    /*if(state.MGC) {
+      // TODO add code for normal Java later
+      generateClassNameTable(outmethod);
+    }*/
 
     //Store the layout of classes
     generateLayoutStructs(outmethod);
 
+
+    additionalCodeAtTopMethodsImplementation( outmethod );
+
+
     /* Generate code for methods */
     if (state.DSM||state.SINGLETM) {
       for(Iterator<LocalityBinding> lbit=locality.getLocalityBindings().iterator(); lbit.hasNext();) {
@@ -718,7 +604,6 @@ public class BuildCode {
        wb.analyze(lb);
        if (!md.getModifiers().isNative()) {
          generateFlatMethod(fm, lb, outmethod);
-      //System.out.println("fm= " + fm + " md= " + md);
        }
       }
     } else {
@@ -749,13 +634,9 @@ public class BuildCode {
     outstructs.println("#define INTPTR int");
     outstructs.println("#endif");
     outstructs.println("#endif");
-    if( state.MLP || state.OOOJAVA ) {
-      outstructs.println("#include \"mlp_runtime.h\"");
-      outstructs.println("#include \"psemaphore.h\"");
-    }
-    if (state.RCR) {
-      outstructs.println("#include \"rcr_runtime.h\"");
-    }
+
+
+    additionalIncludesStructsHeader( outstructs );
 
 
     /* Output #defines that the runtime uses to determine type
@@ -840,17 +721,18 @@ public class BuildCode {
       }
       
       // for each class, create a global object
-      outglobaldefs.println("  struct Class "+cn.getSafeSymbol()+"classobj;");
+      outglobaldefs.println("  struct ___Object___ "+cn.getSafeSymbol()+"classobj;");
       }
     }
     outclassdefs.println("");
     //Print out definition for array type
     outclassdefs.println("struct "+arraytype+" {");
     outclassdefs.println("  int type;");
-    if(state.MLP || state.OOOJAVA ){
-      outclassdefs.println("  int oid;");
-      outclassdefs.println("  int allocsite;");
-    }
+
+    
+    additionalClassObjectFields( outclassdefs );
+
+
     if (state.EVENTMONITOR) {
       outclassdefs.println("  int objuid;");
     }
@@ -884,7 +766,9 @@ public class BuildCode {
        outclassdefs.println("  int * fses;");
       }
     }
+
     printClassStruct(typeutil.getClass(TypeUtil.ObjectClass), outclassdefs, outglobaldefs);
+    printedfieldstbl.clear();
 
     if (state.STMARRAY) {
       outclassdefs.println("  int lowindex;");
@@ -905,10 +789,11 @@ public class BuildCode {
     //Print out definition for Class type 
     outclassdefs.println("struct Class {");
     outclassdefs.println("  int type;");
-    if(state.MLP || state.OOOJAVA ){
-      outclassdefs.println("  int oid;");
-      outclassdefs.println("  int allocsite;");
-    }
+
+
+    additionalClassObjectFields( outclassdefs );
+
+
     if (state.EVENTMONITOR) {
       outclassdefs.println("  int objuid;");
     }
@@ -943,6 +828,7 @@ public class BuildCode {
       }
     }
     printClassStruct(typeutil.getClass(TypeUtil.ObjectClass), outclassdefs, outglobaldefs);
+    printedfieldstbl.clear();
     outclassdefs.println("};\n");
     }
     
@@ -951,10 +837,10 @@ public class BuildCode {
     outclassdefs.println("extern int hasflags[];");
     outclassdefs.println("extern unsigned INTPTR * pointerarray[];");
     outclassdefs.println("extern int supertypes[];");
-    if(state.MGC) {
+    /*if(state.MGC) {
       // TODO add version for normal Java later
-    outclassdefs.println("#include \"globaldefs.h\"");
-    }
+    outclassdefs.println("extern char * classname[];");
+    }*/
     outclassdefs.println("");
   }
 
@@ -1265,10 +1151,7 @@ public class BuildCode {
     outclassdefs.print("#endif\n");
 
     outclassdefs.print("int numprefetchsites = " + pa.prefetchsiteid + ";\n");
-    if(this.state.MLP || state.OOOJAVA ){
-       outclassdefs.print("extern __thread int oid;\n");
-       outclassdefs.print("extern int oidIncrement;\n");
-    }
+
 
     Iterator it=state.getClassSymbolTable().getDescriptorsIterator();
     cdarray=new ClassDescriptor[state.numClasses()];
@@ -1329,7 +1212,7 @@ public class BuildCode {
       if (needcomma)
        outclassdefs.print(", ");
       TypeDescriptor tdelement=arraytable[i].dereference();
-      if (tdelement.isArray()||tdelement.isClass())
+      if (tdelement.isArray()||tdelement.isClass()||tdelement.isNull())
        outclassdefs.print("sizeof(void *)");
       else
        outclassdefs.print("sizeof("+tdelement.getSafeSymbol()+")");
@@ -1595,48 +1478,173 @@ public class BuildCode {
     }
     output.println("};");
   }
+  
+  /** Print out table to give us classnames */
+  /*private void generateClassNameTable(PrintWriter output) {
+    output.println("char * classname[]={");
+    boolean needcomma=false;
+    for(int i=0; i<state.numClasses(); i++) {
+      ClassDescriptor cn=cdarray[i];
+      if (needcomma)
+    output.println(",");
+      needcomma=true;
+      if ((cn != null) && (cn.getSuperDesc()!=null)) {
+    output.print("\"" + cn.getSymbol() + "\"");
+      } else
+    output.print("\"\"");
+    }
+    output.println("};");
+  }*/
 
   /** Force consistent field ordering between inherited classes. */
 
   private void printClassStruct(ClassDescriptor cn, PrintWriter classdefout, PrintWriter globaldefout) {
-
+    
     ClassDescriptor sp=cn.getSuperDesc();
     if (sp!=null)
-      printClassStruct(sp, classdefout, globaldefout);
+      printClassStruct(sp, classdefout, /*globaldefout*/null);
+    
+    // TODO: what about here are multiple inherited fields with the same name?
+    SymbolTable sitbl = cn.getSuperInterfaceTable();
+    Iterator it_sifs = sitbl.getDescriptorsIterator();
+    if(state.MGC) {
+      while(it_sifs.hasNext()) {
+        ClassDescriptor si = (ClassDescriptor)it_sifs.next();
+        printClassStruct(si, classdefout, /*globaldefout*/null);
+      }
+    }
+    
+    Vector shadow_fields = null;
 
     if (!fieldorder.containsKey(cn)) {
       Vector fields=new Vector();
       fieldorder.put(cn,fields);
+      shadow_fields = new Vector();
+      cd2shadowfields.put(cn, shadow_fields);
+      
       Vector fieldvec=cn.getFieldVec();
       for(int i=0;i<fieldvec.size();i++) {
        FieldDescriptor fd=(FieldDescriptor)fieldvec.get(i);
-       if ((sp==null||!sp.getFieldTable().contains(fd.getSymbol())))
-         fields.add(fd);
+    if(state.MGC) {
+      if((sp != null) && sp.getFieldTable().contains(fd.getSymbol())) {
+        shadow_fields.add(fd);
+      } else {
+        it_sifs = sitbl.getDescriptorsIterator();
+        boolean hasprinted = false;
+        while(it_sifs.hasNext()) {
+          ClassDescriptor si = (ClassDescriptor)it_sifs.next();
+          if(si.getFieldTable().contains(fd.getSymbol())) {
+            hasprinted = true;
+            break;
+          }
+        }
+        if(hasprinted) {
+          // this field has been defined in the super class
+          shadow_fields.add(fd);
+        } else {
+          fields.add(fd);
+        }
+      }
+    } else {
+      if ((sp==null) || (!sp.getFieldTable().contains(fd.getSymbol())))
+        fields.add(fd);
+    }
       }
     }
     Vector fields=(Vector)fieldorder.get(cn);
+    shadow_fields=cd2shadowfields.get(cn);
 
     for(int i=0; i<fields.size(); i++) {
       FieldDescriptor fd=(FieldDescriptor)fields.get(i);
-      if (fd.getType().isClass()||fd.getType().isArray())
+      if(printedfieldstbl.containsKey(fd.getSymbol())) {
+        printedfieldstbl.put(fd.getSymbol(), cn);
+        continue;
+      } else {
+        printedfieldstbl.put(fd.getSymbol(), cn);
+      }
+      if (state.MGC && fd.getType().isClass()
+          && fd.getType().getClassDesc().isEnum()) {
+        classdefout.println("  int " + fd.getSafeSymbol() + ";");
+      } else if (fd.getType().isClass()||fd.getType().isArray()) {
+        if ((state.MGC) && (fd.isStatic())) {
+          // TODO add version for normal Java later
+          // static field
+          if(globaldefout != null) {
+            if(fd.isVolatile()) {
+              globaldefout.println("  volatile struct "+fd.getType().getSafeSymbol()+ " * "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+            } else {
+              globaldefout.println("  struct "+fd.getType().getSafeSymbol()+ " * "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+            }
+          }
+          classdefout.println("  struct "+fd.getType().getSafeSymbol()+" ** "+fd.getSafeSymbol()+";");
+        } else if ((state.MGC) && (fd.isVolatile())) {
+          // TODO add version for normal Java later
+          // static field
+          if(globaldefout != null) {
+            globaldefout.println("  volatile struct "+fd.getType().getSafeSymbol()+ " * "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          }
+          classdefout.println("  struct"+fd.getType().getSafeSymbol()+" ** "+fd.getSafeSymbol()+";");
+        } else {
        classdefout.println("  struct "+fd.getType().getSafeSymbol()+" * "+fd.getSafeSymbol()+";");
-      else if ((state.MGC) && (fd.isStatic())) {
+        }
+      } else if ((state.MGC) && (fd.isStatic())) {
         // TODO add version for normal Java later
         // static field
-        if(fd.isVolatile()) {
-          globaldefout.println("  volatile "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
-        } else {
-          globaldefout.println("  "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+        if(globaldefout != null) {
+          if(fd.isVolatile()) {
+            globaldefout.println("  volatile "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          } else {
+            globaldefout.println("  "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          }
         }
         classdefout.println("  "+fd.getType().getSafeSymbol()+" * "+fd.getSafeSymbol()+";");
       } else if ((state.MGC) && (fd.isVolatile())) {
         // TODO add version for normal Java later
         // static field
-        globaldefout.println("  volatile "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+        if(globaldefout != null) {
+          globaldefout.println("  volatile "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+        }
         classdefout.println("  "+fd.getType().getSafeSymbol()+" * "+fd.getSafeSymbol()+";");
       } else
        classdefout.println("  "+fd.getType().getSafeSymbol()+" "+fd.getSafeSymbol()+";");
     }
+    
+    // check the shadow fields, for those static shadow fields, need to add a 
+    // corresponding field in the global_defs_p structure
+    for(int i=0; i<shadow_fields.size(); i++) {
+      FieldDescriptor fd=(FieldDescriptor)shadow_fields.get(i);
+      if ((state.MGC) && (fd.isStatic()) && (globaldefout != null)) {
+        if (fd.getType().isClass()||fd.getType().isArray()) { 
+          // TODO add version for normal Java later
+          // static field
+          if(fd.isVolatile()) {
+            globaldefout.println("  volatile struct "+fd.getType().getSafeSymbol()+ " * "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          } else {
+            globaldefout.println("  struct "+fd.getType().getSafeSymbol()+ " * "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          }
+        } else {
+          // TODO add version for normal Java later
+          // static field
+          if(fd.isVolatile()) {
+            globaldefout.println("  volatile "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          } else {
+            globaldefout.println("  "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+          }
+        } 
+      } else if ((state.MGC) && (fd.isVolatile()) && (globaldefout != null)) {
+        // TODO add version for normal Java later
+        // static field
+        if (fd.getType().isClass()||fd.getType().isArray()) { 
+          // TODO add version for normal Java later
+          // static field
+          globaldefout.println("  volatile struct "+fd.getType().getSafeSymbol()+ " * "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+        } else {
+          // TODO add version for normal Java later
+          // static field
+          globaldefout.println("  volatile "+fd.getType().getSafeSymbol()+ " "+cn.getSafeSymbol()+fd.getSafeSymbol()+";");
+        } 
+      }
+    }
   }
 
 
@@ -1681,10 +1689,11 @@ public class BuildCode {
     /* Output class structure */
     classdefout.println("struct "+cn.getSafeSymbol()+" {");
     classdefout.println("  int type;");
-    if(state.MLP || state.OOOJAVA){
-      classdefout.println("  int oid;");
-      classdefout.println("  int allocsite;");
-    }
+
+
+    additionalClassObjectFields( classdefout );
+
+
     if (state.EVENTMONITOR) {
       classdefout.println("  int objuid;");
     }
@@ -1719,6 +1728,8 @@ public class BuildCode {
       }
     }
     printClassStruct(cn, classdefout, globaldefout);
+    cd2fieldstbl.put(cn, printedfieldstbl);
+    printedfieldstbl = new Hashtable<String, ClassDescriptor>();
     classdefout.println("};\n");
 
     if (state.DSM||state.SINGLETM) {
@@ -1770,7 +1781,11 @@ public class BuildCode {
       output.println("  void * next;");      
       for(int i=0; i<objectparams.numPointers(); i++) {
        TempDescriptor temp=objectparams.getPointer(i);
-       output.println("  struct "+temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol()+";");
+    if(state.MGC && temp.getType().isClass() && temp.getType().getClassDesc().isEnum()) {
+      output.println("  int " + temp.getSafeSymbol() + ";");
+    } else {
+      output.println("  struct "+temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol()+";");
+    }
       }
       output.println("};\n");
     }
@@ -1811,7 +1826,9 @@ public class BuildCode {
     }
     /* First the return type */
     if (md.getReturnType()!=null) {
-      if (md.getReturnType().isClass()||md.getReturnType().isArray())
+      if(state.MGC && md.getReturnType().isClass() && md.getReturnType().getClassDesc().isEnum()) {
+        headersout.println("  int ");
+      } else if (md.getReturnType().isClass()||md.getReturnType().isArray())
        headersout.print("struct " + md.getReturnType().getSafeSymbol()+" * ");
       else
        headersout.print(md.getReturnType().getSafeSymbol()+" ");
@@ -1840,7 +1857,9 @@ public class BuildCode {
       if (printcomma)
        headersout.print(", ");
       printcomma=true;
-      if (temp.getType().isClass()||temp.getType().isArray())
+      if(state.MGC && temp.getType().isClass() && temp.getType().getClassDesc().isEnum()) {
+        headersout.print("int " + temp.getSafeSymbol());
+      } else if (temp.getType().isClass()||temp.getType().isArray())
        headersout.print("struct " + temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol());
       else
        headersout.print(temp.getType().getSafeSymbol()+" "+temp.getSafeSymbol());
@@ -2056,100 +2075,26 @@ public class BuildCode {
     for(int i=0; i<objecttemp.numPrimitives(); i++) {
       TempDescriptor td=objecttemp.getPrimitive(i);
       TypeDescriptor type=td.getType();
-      if (type.isNull())
+      if (type.isNull() && !type.isArray())
        output.println("   void * "+td.getSafeSymbol()+";");
-      else if (type.isClass()||type.isArray())
+      else if (state.MGC && type.isClass() && type.getClassDesc().isEnum()) {
+        output.println("   int " + td.getSafeSymbol() + ";");
+      } else if (type.isClass()||type.isArray())
        output.println("   struct "+type.getSafeSymbol()+" * "+td.getSafeSymbol()+";");
       else
        output.println("   "+type.getSafeSymbol()+" "+td.getSafeSymbol()+";");
     }
 
 
-    if( state.MLP || state.OOOJAVA ) {      
-      if( fm.getNext(0) instanceof FlatSESEEnterNode ) {
-       FlatSESEEnterNode callerSESEplaceholder = (FlatSESEEnterNode) fm.getNext( 0 );
-       if( (state.MLP && callerSESEplaceholder != mlpa.getMainSESE()) ||  
-           (state.OOOJAVA && callerSESEplaceholder != oooa.getMainSESE())
-       ) {
-         // declare variables for naming static SESE's
-         output.println("   /* static SESE names */");
-         Iterator<SESEandAgePair> pItr = callerSESEplaceholder.getNeededStaticNames().iterator();
-         while( pItr.hasNext() ) {
-           SESEandAgePair pair = pItr.next();
-           output.println("   void* "+pair+" = NULL;");
-         }
 
-         // declare variables for tracking dynamic sources
-         output.println("   /* dynamic variable sources */");
-         Iterator<TempDescriptor> dynSrcItr = callerSESEplaceholder.getDynamicVarSet().iterator();
-         while( dynSrcItr.hasNext() ) {
-           TempDescriptor dynSrcVar = dynSrcItr.next();
-           output.println("   SESEcommon*  "+dynSrcVar+"_srcSESE = NULL;");
-           output.println("   INTPTR       "+dynSrcVar+"_srcOffset = 0x1;");
-         }    
-       }
-      }
-      
-      // set up related allocation sites's waiting queues
-      // eom
-      if(state.MLP){
-        ConflictGraph graph = null;
-        graph = mlpa.getConflictGraphResults().get(fm);
-        if (graph != null && graph.hasConflictEdge()) {
-          output.println("   /* set up waiting queues */");
-          output.println("   int numMemoryQueue=0;");
-          output.println("   int memoryQueueItemID=0;");
-          HashSet<SESELock> lockSet = mlpa.getConflictGraphLockMap().get(
-              graph);
-          System.out.println("#lockSet="+lockSet.hashCode());
-          System.out.println("lockset="+lockSet);
-          for (Iterator iterator = lockSet.iterator(); iterator.hasNext();) {
-            SESELock seseLock = (SESELock) iterator.next();
-            System.out.println("id="+seseLock.getID());
-            System.out.println("#="+seseLock);
-          }
-          System.out.println("size="+lockSet.size());
-          if (lockSet.size() > 0) {
-            output.println("   numMemoryQueue=" + lockSet.size() + ";");
-            output.println("   runningSESE->numMemoryQueue=numMemoryQueue;");
-            output.println("   runningSESE->memoryQueueArray=mlpCreateMemoryQueueArray(numMemoryQueue);");
-            output.println();
-          }
-        }
-      }else{
-        FlatSESEEnterNode callerSESEplaceholder = (FlatSESEEnterNode) fm.getNext( 0 );
-        if(callerSESEplaceholder!= oooa.getMainSESE()){
-          Analysis.OoOJava.ConflictGraph graph = oooa.getConflictGraph(callerSESEplaceholder);       
-          if (graph != null && graph.hasConflictEdge()) {          
-            output.println("   // set up waiting queues ");
-            output.println("   int numMemoryQueue=0;");
-            output.println("   int memoryQueueItemID=0;");
-            Set<Analysis.OoOJava.SESELock> lockSet = oooa.getLockMappings(graph);
-            System.out.println("#lockSet="+lockSet.hashCode());
-            System.out.println("lockset="+lockSet);
-            for (Iterator iterator = lockSet.iterator(); iterator.hasNext();) {
-              Analysis.OoOJava.SESELock seseLock = (Analysis.OoOJava.SESELock) iterator.next();
-              System.out.println("id="+seseLock.getID());
-              System.out.println("#="+seseLock);
-            }
-            System.out.println("size="+lockSet.size());
-            if (lockSet.size() > 0) {
-              output.println("   numMemoryQueue=" + lockSet.size() + ";");
-              output.println("   runningSESE->numMemoryQueue=numMemoryQueue;");
-              output.println("   runningSESE->memoryQueueArray=mlpCreateMemoryQueueArray(numMemoryQueue);");
-              output.println();
-            }
-          }
-        }
-      }
-        
-    }    
+    additionalCodeAtTopFlatMethodBody( output, fm );
+    
 
 
     /* Check to see if we need to do a GC if this is a
      * multi-threaded program...*/
 
-    if (((state.MLP||state.OOOJAVA||state.THREAD||state.DSM||state.SINGLETM)&&GENERATEPRECISEGC) 
+    if (((state.OOOJAVA||state.THREAD||state.DSM||state.SINGLETM)&&GENERATEPRECISEGC) 
         || this.state.MULTICOREGC) {
       //Don't bother if we aren't in recursive methods...The loops case will catch it
       if (callgraph.getAllMethods(md).contains(md)) {
@@ -2176,548 +2121,30 @@ public class BuildCode {
       // is a constructor, check and output initialization of the static fields
       // here does not initialize the static fields of the class, instead it 
       // redirect the corresponding fields in the object to the global_defs_p
-      Vector fields=(Vector)fieldorder.get(cn);
-
-      for(int i=0; i<fields.size(); i++) {
-        FieldDescriptor fd=(FieldDescriptor)fields.get(i);
-        if(fd.isStatic()) {
-          // static field
-          output.println(generateTemp(fm,fm.getParameter(0),lb)+"->"+fd.getSafeSymbol()+"=&(global_defs_p->"+cn.getSafeSymbol()+fd.getSafeSymbol()+");");
-        }
-      }
-    }
-    }
-
-    generateCode(fm.getNext(0), fm, lb, null, output, true);
-
-    output.println("}\n\n");
-  }
-
-
-  protected void initializeSESE( FlatSESEEnterNode fsen ) {
-
-    FlatMethod       fm = fsen.getfmEnclosing();
-    MethodDescriptor md = fm.getMethod();
-    ClassDescriptor  cn = md.getClassDesc();
-    
-        
-    // Creates bogus method descriptor to index into tables
-    Modifiers modBogus = new Modifiers();
-    MethodDescriptor mdBogus = 
-      new MethodDescriptor( modBogus, 
-                           new TypeDescriptor( TypeDescriptor.VOID ), 
-                           "sese_"+fsen.getPrettyIdentifier()+fsen.getIdentifier()
-                           );
-    
-    mdBogus.setClassDesc( fsen.getcdEnclosing() );
-    FlatMethod fmBogus = new FlatMethod( mdBogus, null );
-    fsen.setfmBogus( fmBogus );
-    fsen.setmdBogus( mdBogus );
-
-    Set<TempDescriptor> inSetAndOutSet = new HashSet<TempDescriptor>();
-    inSetAndOutSet.addAll( fsen.getInVarSet() );
-    inSetAndOutSet.addAll( fsen.getOutVarSet() );
-
-    // Build paramsobj for bogus method descriptor
-    ParamsObject objectparams = new ParamsObject( mdBogus, tag++ );
-    paramstable.put( mdBogus, objectparams );
-    
-    Iterator<TempDescriptor> itr = inSetAndOutSet.iterator();
-    while( itr.hasNext() ) {
-      TempDescriptor temp = itr.next();
-      TypeDescriptor type = temp.getType();
-      if( type.isPtr() ) {
-       objectparams.addPtr( temp );
-      } else {
-       objectparams.addPrim( temp );
-      }
-    }
-        
-    // Build normal temp object for bogus method descriptor
-    TempObject objecttemps = new TempObject( objectparams, mdBogus, tag++ );
-    tempstable.put( mdBogus, objecttemps );
-
-    for( Iterator nodeit = fsen.getNodeSet().iterator(); nodeit.hasNext(); ) {
-      FlatNode         fn     = (FlatNode)nodeit.next();
-      TempDescriptor[] writes = fn.writesTemps();
-
-      for( int i = 0; i < writes.length; i++ ) {
-       TempDescriptor temp = writes[i];
-       TypeDescriptor type = temp.getType();
-
-       if( type.isPtr() ) {
-         objecttemps.addPtr( temp );
-       } else {
-         objecttemps.addPrim( temp );
-       }
-      }
-    }
-  }
-
-  // used when generating the specific SESE record struct
-  // to remember the FIRST field name of sese records 
-  // that the current SESE depends on--we need to know the
-  // offset to the first one for garbage collection
-  protected void addingDepRecField( FlatSESEEnterNode fsen,
-                                    String            field ) {
-    if( fsen.getFirstDepRecField() == null ) {
-      fsen.setFirstDepRecField( field );
-    }
-    fsen.incNumDepRecs();
-  }
-
-  protected void generateMethodSESE(FlatSESEEnterNode fsen,
-                                    LocalityBinding lb,
-                                    PrintWriter outputStructs,
-                                    PrintWriter outputMethHead,
-                                    PrintWriter outputMethods
-                                    ) {
-
-    ParamsObject objectparams = (ParamsObject) paramstable.get( fsen.getmdBogus() );                
-    TempObject   objecttemps  = (TempObject)   tempstable .get( fsen.getmdBogus() );
-    
-    // generate locals structure
-    outputStructs.println("struct "+
-                         fsen.getcdEnclosing().getSafeSymbol()+
-                         fsen.getmdBogus().getSafeSymbol()+"_"+
-                         fsen.getmdBogus().getSafeMethodDescriptor()+
-                         "_locals {");
-    outputStructs.println("  int size;");
-    outputStructs.println("  void * next;");
-    for(int i=0; i<objecttemps.numPointers(); i++) {
-      TempDescriptor temp=objecttemps.getPointer(i);
-
-      if (temp.getType().isNull())
-        outputStructs.println("  void * "+temp.getSafeSymbol()+";");
-      else
-        outputStructs.println("  struct "+
-                             temp.getType().getSafeSymbol()+" * "+
-                             temp.getSafeSymbol()+";");
-    }
-    outputStructs.println("};\n");
-
-    
-    // divide in-set and out-set into objects and primitives to prep
-    // for the record generation just below
-    Set<TempDescriptor> inSetAndOutSet = new HashSet<TempDescriptor>();
-    inSetAndOutSet.addAll( fsen.getInVarSet() );
-    inSetAndOutSet.addAll( fsen.getOutVarSet() );
-
-    Set<TempDescriptor> inSetAndOutSetObjs  = new HashSet<TempDescriptor>();
-    Set<TempDescriptor> inSetAndOutSetPrims = new HashSet<TempDescriptor>();
-
-    Iterator<TempDescriptor> itr = inSetAndOutSet.iterator();
-    while( itr.hasNext() ) {
-      TempDescriptor temp = itr.next();
-      TypeDescriptor type = temp.getType();
-      if( type.isPtr() ) {
-        inSetAndOutSetObjs.add( temp );
-      } else {
-       inSetAndOutSetPrims.add( temp );
-      }
-    }
-
-
-    // generate the SESE record structure
-    outputStructs.println(fsen.getSESErecordName()+" {");
-    
-    // data common to any SESE, and it must be placed first so
-    // a module that doesn't know what kind of SESE record this
-    // is can cast the pointer to a common struct
-    outputStructs.println("  SESEcommon common;");
-
-    // then garbage list stuff
-    outputStructs.println("  /* next is in-set and out-set objects that look like a garbage list */");
-    outputStructs.println("  int size;");
-    outputStructs.println("  void * next;");
-
-    // I think that the set of TempDescriptors inSetAndOutSetObjs
-    // calculated above should match the pointer object params
-    // used in the following code, but let's just leave the working
-    // implementation unless there is actually a problem...
-
-    Vector<TempDescriptor> inset=fsen.getInVarsForDynamicCoarseConflictResolution();
-    for(int i=0; i<inset.size();i++) {
-      TempDescriptor temp=inset.get(i);
-      if (temp.getType().isNull())
-       outputStructs.println("  void * "+temp.getSafeSymbol()+
-                             ";  /* in-or-out-set obj in gl */");
-      else
-       outputStructs.println("  struct "+temp.getType().getSafeSymbol()+" * "+
-                             temp.getSafeSymbol()+"; /* in-or-out-set obj in gl */");
-    }
-
-    for(int i=0; i<objectparams.numPointers(); i++) {
-      TempDescriptor temp=objectparams.getPointer(i);
-      if (!inset.contains(temp)) {
-       if (temp.getType().isNull())
-         outputStructs.println("  void * "+temp.getSafeSymbol()+
-                               ";  /* in-or-out-set obj in gl */");
-       else
-         outputStructs.println("  struct "+temp.getType().getSafeSymbol()+" * "+
-                               temp.getSafeSymbol()+"; /* in-or-out-set obj in gl */");
-      }
-    }
-    
-    outputStructs.println("  /* next is primitives for in-set and out-set and dynamic tracking */");
-
-    Iterator<TempDescriptor> itrPrims = inSetAndOutSetPrims.iterator();
-    while( itrPrims.hasNext() ) {
-      TempDescriptor temp = itrPrims.next();
-      TypeDescriptor type = temp.getType();
-      if(type.isPrimitive()){
-         outputStructs.println("  "+temp.getType().getSafeSymbol()+" "+temp.getSafeSymbol()+"; /* in-set or out-set primitive */");
-      }      
-    }
-    
-    // note that the sese record pointer will be added below, just primitive part of tracking here
-    Iterator<TempDescriptor> itrDynInVars = fsen.getDynamicInVarSet().iterator();
-    while( itrDynInVars.hasNext() ) {
-      TempDescriptor dynInVar = itrDynInVars.next();
-      outputStructs.println("  INTPTR "+dynInVar+"_srcOffset; /* dynamic tracking primitive */");
-    }  
-    
-    
-    outputStructs.println("  /* everything after this should be pointers to an SESE record */" );
-
-    // other half of info for dynamic tracking, the SESE record pointer
-    itrDynInVars = fsen.getDynamicInVarSet().iterator();
-    while( itrDynInVars.hasNext() ) {
-      TempDescriptor dynInVar = itrDynInVars.next();
-      String depRecField = dynInVar+"_srcSESE";
-      outputStructs.println("  SESEcommon* "+depRecField+";");
-      addingDepRecField( fsen, depRecField );
-    }  
-    
-    // statically known sese sources are record pointers, too
-    Iterator<SESEandAgePair> itrStaticInVarSrcs = fsen.getStaticInVarSrcs().iterator();
-    while( itrStaticInVarSrcs.hasNext() ) {
-      SESEandAgePair srcPair = itrStaticInVarSrcs.next();
-      outputStructs.println("  "+srcPair.getSESE().getSESErecordName()+"* "+srcPair+";");
-      addingDepRecField(fsen, srcPair.toString());
-    }
-
-    if (state.RCR) {
-      if (inset.size()!=0)
-       outputStructs.println("struct rcrRecord rcrRecords["+inset.size()+"];");
-    }
-    
-    if( fsen.getFirstDepRecField() != null ) {
-      outputStructs.println("  /* compiler believes first dependent SESE record field above is: "+
-                            fsen.getFirstDepRecField()+" */" );
-    }
-    outputStructs.println("};\n");
-
-    
-    // write method declaration to header file
-    outputMethHead.print("void ");
-    outputMethHead.print(fsen.getSESEmethodName()+"(");
-    outputMethHead.print(fsen.getSESErecordName()+"* "+paramsprefix);
-    outputMethHead.println(");\n");
-
-
-    generateFlatMethodSESE( fsen.getfmBogus(), 
-                           fsen.getcdEnclosing(), 
-                           fsen, 
-                           fsen.getFlatExit(), 
-                           outputMethods );
-  }
-
-  private void generateFlatMethodSESE(FlatMethod fm, 
-                                      ClassDescriptor cn, 
-                                      FlatSESEEnterNode fsen, 
-                                      FlatSESEExitNode  seseExit, 
-                                      PrintWriter output
-                                      ) {
-
-    MethodDescriptor md=fm.getMethod();
-
-    output.print("void ");
-    output.print(fsen.getSESEmethodName()+"(");
-    output.print(fsen.getSESErecordName()+"* "+paramsprefix);
-    output.println("){\n");
-
-
-    TempObject objecttemp=(TempObject) tempstable.get(md);
-
-    if ((GENERATEPRECISEGC) || (this.state.MULTICOREGC)) {
-      output.print("   struct "+cn.getSafeSymbol()+md.getSafeSymbol()+"_"+md.getSafeMethodDescriptor()+"_locals "+localsprefix+"={");
-      output.print(objecttemp.numPointers()+",");
-      output.print("&(((SESEcommon*)(___params___))[1])");
-      for(int j=0; j<objecttemp.numPointers(); j++)
-       output.print(", NULL");
-      output.println("};");
-    }
-
-    output.println("   /* regular local primitives */");
-    for(int i=0; i<objecttemp.numPrimitives(); i++) {
-      TempDescriptor td=objecttemp.getPrimitive(i);
-      TypeDescriptor type=td.getType();
-      if (type.isNull())
-       output.println("   void * "+td.getSafeSymbol()+";");
-      else if (type.isClass()||type.isArray())
-       output.println("   struct "+type.getSafeSymbol()+" * "+td.getSafeSymbol()+";");
-      else
-       output.println("   "+type.getSafeSymbol()+" "+td.getSafeSymbol()+";");
-    }
-
-
-    // declare variables for naming static SESE's
-    output.println("   /* static SESE names */");
-    Iterator<SESEandAgePair> pItr = fsen.getNeededStaticNames().iterator();
-    while( pItr.hasNext() ) {
-      SESEandAgePair pair = pItr.next();
-      output.println("   SESEcommon* "+pair+" = NULL;");
-    }
-
-    // declare variables for tracking dynamic sources
-    output.println("   /* dynamic variable sources */");
-    Iterator<TempDescriptor> dynSrcItr = fsen.getDynamicVarSet().iterator();
-    while( dynSrcItr.hasNext() ) {
-      TempDescriptor dynSrcVar = dynSrcItr.next();
-      output.println("   SESEcommon*  "+dynSrcVar+"_srcSESE = NULL;");
-      output.println("   INTPTR       "+dynSrcVar+"_srcOffset = 0x1;");
-    }    
-
-    // declare local temps for in-set primitives, and if it is
-    // a ready-source variable, get the value from the record
-    output.println("   /* local temps for in-set primitives */");
-    Iterator<TempDescriptor> itrInSet = fsen.getInVarSet().iterator();
-    while( itrInSet.hasNext() ) {
-      TempDescriptor temp = itrInSet.next();
-      TypeDescriptor type = temp.getType();
-      if( !type.isPtr() ) {
-       if( fsen.getReadyInVarSet().contains( temp ) ) {
-         output.println("   "+type+" "+temp+" = "+paramsprefix+"->"+temp+";");
-       } else {
-         output.println("   "+type+" "+temp+";");
-       }
-      }
-    }    
-
-    // declare local temps for out-set primitives if its not already
-    // in the in-set, and it's value will get written so no problem
-    output.println("   /* local temp for out-set prim, not already in the in-set */");
-    Iterator<TempDescriptor> itrOutSet = fsen.getOutVarSet().iterator();
-    while( itrOutSet.hasNext() ) {
-      TempDescriptor temp = itrOutSet.next();
-      TypeDescriptor type = temp.getType();
-      if( !type.isPtr() && !fsen.getInVarSet().contains( temp ) ) {
-       output.println("   "+type+" "+temp+";");       
-      }
-    }
-
-
-    // initialize thread-local var to a the task's record, which is fused
-    // with the param list
-    output.println("   ");
-    output.println("   // code of this task's body should use this to access the running task record");
-    output.println("   runningSESE = &(___params___->common);");
-    output.println("   childSESE = 0;");
-    output.println("   ");
-    
-    // setup memory queue
-    // eom
-    if(state.OOOJAVA){
-      output.println("   // set up memory queues ");
-      output.println("   int numMemoryQueue=0;");
-      output.println("   int memoryQueueItemID=0;");
-      Analysis.OoOJava.ConflictGraph graph = oooa.getConflictGraph(fsen);
-      if (graph != null && graph.hasConflictEdge()) {
-       output.println("   {");
-       Set<Analysis.OoOJava.SESELock> lockSet = oooa.getLockMappings(graph);
-       System.out.println("#lockSet="+lockSet);
-       if (lockSet.size() > 0) {
-         output.println("   numMemoryQueue=" + lockSet.size() + ";");
-         output.println("   runningSESE->numMemoryQueue=numMemoryQueue;");
-         output.println("   runningSESE->memoryQueueArray=mlpCreateMemoryQueueArray(numMemoryQueue);");
-         output.println();
-       }
-       output.println("   }");
-      }
-    } else {
-      output.println("   // set up memory queues ");
-      output.println("   int numMemoryQueue=0;");
-      output.println("   int memoryQueueItemID=0;");
-      ConflictGraph graph = null;
-      graph = mlpa.getConflictGraphResults().get(fsen);
-      if (graph != null && graph.hasConflictEdge()) {
-        output.println("   {");
-        HashSet<SESELock> lockSet = mlpa.getConflictGraphLockMap().get(
-            graph);
-        System.out.println("#lockSet="+lockSet);
-
-        if (lockSet.size() > 0) {
-          output.println("   numMemoryQueue=" + lockSet.size() + "; ");
-          output.println("   runningSESE->numMemoryQueue=numMemoryQueue;");
-          output.println("   runningSESE->memoryQueueArray=mlpCreateMemoryQueueArray(numMemoryQueue);");
-          output.println();
-        }
-        output.println("   }");
-      }
-    }
-
-
-    // set up a task's mem pool to recycle the allocation of children tasks
-    // don't bother if the task never has children (a leaf task)
-    output.println( "#ifndef OOO_DISABLE_TASKMEMPOOL" );
-    if( !fsen.getIsLeafSESE() ) {
-      output.println("   runningSESE->taskRecordMemPool = poolcreate( "+
-                     maxTaskRecSizeStr+", freshTaskRecordInitializer );");
-      if (state.RCR && !rcr.hasEmptyTraversers(fsen)) {
-        output.println("   createTR();");
-        output.println("   runningSESE->allHashStructures=TRqueue->allHashStructures;");
-      }
-    } else {
-      // make it clear we purposefully did not initialize this
-      output.println("   runningSESE->taskRecordMemPool = (MemPool*)0x7;");
-    }
-    output.println( "#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-
-    // copy in-set into place, ready vars were already 
-    // copied when the SESE was issued
-    Iterator<TempDescriptor> tempItr;
-
-    // static vars are from a known SESE
-    output.println("   // copy variables from static sources");
-    tempItr = fsen.getStaticInVarSet().iterator();
-    while( tempItr.hasNext() ) {
-      TempDescriptor temp = tempItr.next();
-      VariableSourceToken vst = fsen.getStaticInVarSrc( temp );
-      SESEandAgePair srcPair = new SESEandAgePair( vst.getSESE(), vst.getAge() );
-      output.println("   "+generateTemp( fsen.getfmBogus(), temp, null )+
-                    " = "+paramsprefix+"->"+srcPair+"->"+vst.getAddrVar()+";");
-    }
-    
-    output.println("   // decrement references to static sources");
-    for( Iterator<SESEandAgePair> pairItr = fsen.getStaticInVarSrcs().iterator(); pairItr.hasNext(); ) {
-      SESEandAgePair srcPair = pairItr.next();
-      output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-      output.println("   {");
-      output.println("     SESEcommon* src = &("+paramsprefix+"->"+srcPair+"->common);");
-      output.println("     RELEASE_REFERENCE_TO( src );");
-      output.println("   }");
-      output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-    }
-
-
-    // dynamic vars come from an SESE and src
-    output.println("     // copy variables from dynamic sources");
-    tempItr = fsen.getDynamicInVarSet().iterator();
-    while( tempItr.hasNext() ) {
-      TempDescriptor temp = tempItr.next();
-      TypeDescriptor type = temp.getType();
-      
-      // go grab it from the SESE source
-      output.println("   if( "+paramsprefix+"->"+temp+"_srcSESE != NULL ) {");
-
-      String typeStr;
-      if( type.isNull() ) {
-       typeStr = "void*";
-      } else if( type.isClass() || type.isArray() ) {
-       typeStr = "struct "+type.getSafeSymbol()+"*";
-      } else {
-       typeStr = type.getSafeSymbol();
-      }
-      
-      output.println("     "+generateTemp( fsen.getfmBogus(), temp, null )+
-                    " = *(("+typeStr+"*) ((void*)"+
-                    paramsprefix+"->"+temp+"_srcSESE + "+
-                    paramsprefix+"->"+temp+"_srcOffset));");
-
-      output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-      output.println("     SESEcommon* src = "+paramsprefix+"->"+temp+"_srcSESE;");
-      output.println("     RELEASE_REFERENCE_TO( src );");
-      output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-      // or if the source was our parent, its already in our record to grab
-      output.println("   } else {");
-      output.println("     "+generateTemp( fsen.getfmBogus(), temp, null )+
-                          " = "+paramsprefix+"->"+temp+";");
-      output.println("   }");
-    }
-
-    // Check to see if we need to do a GC if this is a
-    // multi-threaded program...    
-    if ((GENERATEPRECISEGC) || (this.state.MULTICOREGC)) {
-       output.println("if (unlikely(needtocollect)) checkcollect("+localsprefixaddr+");");
-      //Don't bother if we aren't in recursive methods...The loops case will catch it
-//      if (callgraph.getAllMethods(md).contains(md)) {
-//        if(this.state.MULTICOREGC) {
-//          output.println("if(gcflag) gc("+localsprefixaddr+");");
-//        } else {
-//       output.println("if (unlikely(needtocollect)) checkcollect("+localsprefixaddr+");");
-//     }
-//      }
-    }    
-
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_TASKEXECUTE");
-      output.println("   CP_LOGEVENT( CP_EVENTID_TASKEXECUTE, CP_EVENTTYPE_BEGIN );");
-      output.println("#endif");
-    }
-
-    HashSet<FlatNode> exitset=new HashSet<FlatNode>();
-    exitset.add(seseExit);    
-    generateCode(fsen.getNext(0), fm, null, exitset, output, true);
-    output.println("}\n\n");
-    
-  }
+      Vector fields=cn.getFieldVec();
 
+      for(int i=0; i<fields.size(); i++) {
+        FieldDescriptor fd=(FieldDescriptor)fields.get(i);
+        if(fd.isStatic()) {
+          // static field
+          // decide the exact class/interface that defines the field
+          ClassDescriptor fdcn = 
+            cd2fieldstbl.get(cn).get(fd.getSymbol());
 
-  // when a new mlp thread is created for an issued SESE, it is started
-  // by running this method which blocks on a cond variable until
-  // it is allowed to transition to execute.  Then a case statement
-  // allows it to invoke the method with the proper SESE body, and after
-  // exiting the SESE method, executes proper SESE exit code before the
-  // thread can be destroyed
-  private void generateSESEinvocationMethod(PrintWriter outmethodheader,
-                                            PrintWriter outmethod
-                                            ) {
-
-    outmethodheader.println("void* invokeSESEmethod( void* seseRecord );");
-    outmethod.println(      "void* invokeSESEmethod( void* seseRecord ) {");
-    outmethod.println(      "  int status;");
-    outmethod.println(      "  char errmsg[128];");
-
-    // generate a case for each SESE class that can be invoked
-    outmethod.println(      "  switch( ((SESEcommon*)seseRecord)->classID ) {");
-    outmethod.println(      "    ");
-    Iterator<FlatSESEEnterNode> seseit;
-    if(state.MLP){
-      seseit=mlpa.getAllSESEs().iterator();
-    }else{
-      seseit=oooa.getAllSESEs().iterator();
-    }
-    while(seseit.hasNext()){
-      FlatSESEEnterNode fsen = seseit.next();
-
-      outmethod.println(    "    /* "+fsen.getPrettyIdentifier()+" */");
-      outmethod.println(    "    case "+fsen.getIdentifier()+":");
-      outmethod.println(    "      "+fsen.getSESEmethodName()+"( seseRecord );");  
-      
-      if( (state.MLP && fsen.equals( mlpa.getMainSESE() )) || 
-          (state.OOOJAVA && fsen.equals( oooa.getMainSESE() ))
-      ) {
-        outmethod.println(  "      workScheduleExit();");
+          // static field
+          output.println(generateTemp(fm,fm.getParameter(0),lb)+"->"+fd.getSafeSymbol()+"=&(global_defs_p->"+fdcn.getSafeSymbol()+fd.getSafeSymbol()+");");
+        }
       }
-
-      outmethod.println(    "      break;");
-      outmethod.println(    "");
     }
+    }
+
+    generateCode(fm.getNext(0), fm, lb, null, output, true);
 
-    // default case should never be taken, error out
-    outmethod.println(      "    default:");
-    outmethod.println(      "      printf(\"Error: unknown SESE class ID in invoke method.\\n\");");
-    outmethod.println(      "      exit(-30);");
-    outmethod.println(      "      break;");
-    outmethod.println(      "  }");
-    outmethod.println(      "  return NULL;");
-    outmethod.println(      "}\n\n");
+    output.println("}\n\n");
   }
 
 
+
   protected void generateCode(FlatNode first,
                               FlatMethod fm,
                               LocalityBinding lb,
@@ -2802,7 +2229,7 @@ public class BuildCode {
            output.println("primitives->"+tmp.getSafeSymbol()+"="+tmp.getSafeSymbol()+";");
          }
        }
-       if ((state.MLP || state.OOOJAVA) && stopset!=null) {
+       if (state.OOOJAVA && stopset!=null) {
          assert first.getPrev( 0 ) instanceof FlatSESEEnterNode;
          assert current_node       instanceof FlatSESEExitNode;
          FlatSESEEnterNode fsen = (FlatSESEEnterNode) first.getPrev( 0 );
@@ -2824,9 +2251,8 @@ public class BuildCode {
        current_node=null;
       } else if(current_node.numNext()==1) {
        FlatNode nextnode;
-       if ((state.MLP|| state.OOOJAVA) && 
-           current_node.kind()==FKind.FlatSESEEnterNode && 
-           !((FlatSESEEnterNode)current_node).getIsCallerSESEplaceholder()
+       if (state.OOOJAVA && 
+           current_node.kind()==FKind.FlatSESEEnterNode
           ) {
          FlatSESEEnterNode fsen = (FlatSESEEnterNode)current_node;
          generateFlatNode(fm, lb, current_node, output);
@@ -3107,386 +2533,12 @@ public class BuildCode {
   }
 
 
-  void stallMEMRCR(FlatMethod fm, FlatNode fn, Set<Analysis.OoOJava.WaitingElement> waitingElementSet, PrintWriter output) {
-    output.println("// stall on parent's stall sites ");
-    output.println("   {");
-    output.println("     REntry* rentry;");
-    output.println("     // stallrecord sometimes is used as a task record for instance ");
-    output.println("     // when you call RELEASE_REFERENCE_TO on a stall record.");
-    output.println("     // so the parent field must be initialized.");
-    output.println("     SESEstall * stallrecord=(SESEstall *) poolalloc(runningSESE->taskRecordMemPool);");    
-    output.println("     stallrecord->common.parent=runningSESE;");
-    output.println("     stallrecord->common.unresolvedDependencies=10000;");
-    output.println("     stallrecord->common.rcrstatus=1;");
-    output.println("     stallrecord->common.offsetToParamRecords=(INTPTR) & (((SESEstall *)0)->rcrRecords);");
-    output.println("     stallrecord->common.refCount = 10003;");
-    output.println("     int localCount=10000;");
-    output.println("     stallrecord->rcrRecords[0].index=0;");
-    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();) {
-      Analysis.OoOJava.WaitingElement waitingElement =(Analysis.OoOJava.WaitingElement) iterator.next();
-      if (waitingElement.getStatus() >= ConflictNode.COARSE) {
-       output.println("     rentry=mlpCreateREntry(runningSESE->memoryQueueArray["
-                      + waitingElement.getQueueID() + "]," + waitingElement.getStatus()
-                      + ", (SESEcommon *) stallrecord, 1LL);");
-      } else {
-       throw new Error("Fine-grained conflict: This should not happen in RCR");
-      }
-      output.println("     rentry->queue=runningSESE->memoryQueueArray["
-                    + waitingElement.getQueueID() + "];");
-      output.println("     if(ADDRENTRY(runningSESE->memoryQueueArray["
-                    + waitingElement.getQueueID() + "],rentry)==NOTREADY) {");
-      output.println("       localCount--;");
-      output.println("     }");
-      output.println("#if defined(RCR)&&!defined(OOO_DISABLE_TASKMEMPOOL)");
-      output.println("     else poolfreeinto(runningSESE->memoryQueueArray["+waitingElement.getQueueID()+"]->rentrypool, rentry);");
-      output.println("#endif");
-      if (stalltd==null) {
-       stalltd=waitingElement.getTempDesc();
-      } else if (stalltd!=waitingElement.getTempDesc()) {
-       throw new Error("Multiple temp descriptors at stall site"+stalltd+"!="+waitingElement.getTempDesc());
-      }
-    }
-
-    //did all of the course grained stuff
-    output.println("     if(!atomic_sub_and_test(localCount, &(stallrecord->common.unresolvedDependencies))) {");
-    //have to do fine-grained work also
-    output.println("       stallrecord->___obj___=(struct ___Object___ *)"
-                  + generateTemp(fm, stalltd, null) + ";");
-    output.println("       stallrecord->common.classID=-"
-                  + rcr.getTraverserID(stalltd, fn) + ";");
-    
-    output.println("       enqueueTR(TRqueue, (void *)stallrecord);");
-
-    if (state.COREPROF) {
-      output.println("#ifdef CP_EVENTID_TASKSTALLMEM");
-      output
-       .println("        CP_LOGEVENT( CP_EVENTID_TASKSTALLMEM, CP_EVENTTYPE_BEGIN );");
-      output.println("#endif");
-    }    
-    
-    output.println("       psem_take( &runningSESEstallSem, (struct garbagelist *)&___locals___ );");
-    
-    if (state.COREPROF) {
-      output.println("#ifdef CP_EVENTID_TASKSTALLMEM");
-      output
-       .println("        CP_LOGEVENT( CP_EVENTID_TASKSTALLMEM, CP_EVENTTYPE_END );");
-      output.println("#endif");
-    }
-
-    output.println("     } else {");//exit if condition
-    //release traversers reference if we didn't use traverser
-    output.println("#ifndef OOO_DISABLE_TASKMEMPOOL");
-    output.println("  RELEASE_REFERENCE_TO((SESEcommon *)stallrecord);");
-    output.println("#endif");
-    output.println("     }");
-    //release our reference to stall record
-    output.println("#ifndef OOO_DISABLE_TASKMEMPOOL");
-    output.println("  RELEASE_REFERENCE_TO((SESEcommon *)stallrecord);");
-    output.println("#endif");
-    output.println("   }");//exit block
-  }
 
   protected void generateFlatNode(FlatMethod fm, LocalityBinding lb, FlatNode fn, PrintWriter output) {
 
-    // insert pre-node actions from the code plan
-    if( state.MLP|| state.OOOJAVA ) {
-      
-      CodePlan cp;
-      if(state.MLP){
-        cp = mlpa.getCodePlan( fn );
-      }else{
-        cp = oooa.getCodePlan(fn);
-      }
-
-      if( cp != null ) {
-       
-       FlatSESEEnterNode currentSESE = cp.getCurrentSESE();
-       
-       // for each sese and age pair that this parent statement
-       // must stall on, take that child's stall semaphore, the
-       // copying of values comes after the statement
-       Iterator<VariableSourceToken> vstItr = cp.getStallTokens().iterator();
-       while( vstItr.hasNext() ) {
-         VariableSourceToken vst = vstItr.next();
-
-         SESEandAgePair pair = new SESEandAgePair( vst.getSESE(), vst.getAge() );
-
-         output.println("   {");
-         output.println("     "+pair.getSESE().getSESErecordName()+"* child = ("+
-                         pair.getSESE().getSESErecordName()+"*) "+pair+";");
-
-         output.println("     SESEcommon* childCom = (SESEcommon*) "+pair+";");
-
-          if( state.COREPROF ) {
-            output.println("#ifdef CP_EVENTID_TASKSTALLVAR");
-            output.println("     CP_LOGEVENT( CP_EVENTID_TASKSTALLVAR, CP_EVENTTYPE_BEGIN );");
-            output.println("#endif");
-          }
-
-         output.println("     pthread_mutex_lock( &(childCom->lock) );");
-         output.println("     if( childCom->doneExecuting == FALSE ) {");
-          output.println("       psem_reset( &runningSESEstallSem );");
-         output.println("       childCom->parentsStallSem = &runningSESEstallSem;");
-         output.println("       pthread_mutex_unlock( &(childCom->lock) );");
-         output.println("       psem_take( &runningSESEstallSem, (struct garbagelist *)&___locals___ );");
-         output.println("     } else {");
-         output.println("       pthread_mutex_unlock( &(childCom->lock) );");
-         output.println("     }");
-
-         // copy things we might have stalled for                
-         Iterator<TempDescriptor> tdItr = cp.getCopySet( vst ).iterator();
-         while( tdItr.hasNext() ) {
-           TempDescriptor td = tdItr.next();
-           FlatMethod fmContext;
-           if( currentSESE.getIsCallerSESEplaceholder() ) {
-             fmContext = currentSESE.getfmEnclosing();
-           } else {
-             fmContext = currentSESE.getfmBogus();
-           }
-           output.println("       "+generateTemp( fmContext, td, null )+
-                          " = child->"+vst.getAddrVar().getSafeSymbol()+";");
-         }
-
-          if( state.COREPROF ) {
-            output.println("#ifdef CP_EVENTID_TASKSTALLVAR");
-            output.println("     CP_LOGEVENT( CP_EVENTID_TASKSTALLVAR, CP_EVENTTYPE_END );");
-            output.println("#endif");
-          }
-
-         output.println("   }");
-       }
-  
-       // for each variable with a dynamic source, stall just for that variable
-       Iterator<TempDescriptor> dynItr = cp.getDynamicStallSet().iterator();
-       while( dynItr.hasNext() ) {
-         TempDescriptor dynVar = dynItr.next();
-
-         // only stall if the dynamic source is not yourself, denoted by src==NULL
-         // otherwise the dynamic write nodes will have the local var up-to-date
-         output.println("   {");
-         output.println("     if( "+dynVar+"_srcSESE != NULL ) {");
-
-         output.println("       SESEcommon* childCom = (SESEcommon*) "+dynVar+"_srcSESE;");
-
-          if( state.COREPROF ) {
-            output.println("#ifdef CP_EVENTID_TASKSTALLVAR");
-            output.println("       CP_LOGEVENT( CP_EVENTID_TASKSTALLVAR, CP_EVENTTYPE_BEGIN );");
-            output.println("#endif");
-          }
-
-         output.println("     pthread_mutex_lock( &(childCom->lock) );");
-         output.println("     if( childCom->doneExecuting == FALSE ) {");
-          output.println("       psem_reset( &runningSESEstallSem );");
-         output.println("       childCom->parentsStallSem = &runningSESEstallSem;");
-         output.println("       pthread_mutex_unlock( &(childCom->lock) );");
-         output.println("       psem_take( &runningSESEstallSem, (struct garbagelist *)&___locals___ );");
-         output.println("     } else {");
-         output.println("       pthread_mutex_unlock( &(childCom->lock) );");
-         output.println("     }");
-
-         FlatMethod fmContext;
-         if( currentSESE.getIsCallerSESEplaceholder() ) {
-           fmContext = currentSESE.getfmEnclosing();
-         } else {
-           fmContext = currentSESE.getfmBogus();
-         }
-         
-         TypeDescriptor type = dynVar.getType();
-          String typeStr;
-          if( type.isNull() ) {
-            typeStr = "void*";
-          } else if( type.isClass() || type.isArray() ) {
-            typeStr = "struct "+type.getSafeSymbol()+"*";
-          } else {
-            typeStr = type.getSafeSymbol();
-          }
-      
-         output.println("       "+generateTemp( fmContext, dynVar, null )+
-                         " = *(("+typeStr+"*) ((void*)"+
-                         dynVar+"_srcSESE + "+dynVar+"_srcOffset));");
-
-          if( state.COREPROF ) {
-            output.println("#ifdef CP_EVENTID_TASKSTALLVAR");
-            output.println("       CP_LOGEVENT( CP_EVENTID_TASKSTALLVAR, CP_EVENTTYPE_END );");
-            output.println("#endif");
-          }
-
-         output.println("     }");
-         output.println("   }");
-       }
-
-       // for each assignment of a variable to rhs that has a dynamic source,
-       // copy the dynamic sources
-       Iterator dynAssignItr = cp.getDynAssigns().entrySet().iterator();
-       while( dynAssignItr.hasNext() ) {
-         Map.Entry      me  = (Map.Entry)      dynAssignItr.next();
-         TempDescriptor lhs = (TempDescriptor) me.getKey();
-         TempDescriptor rhs = (TempDescriptor) me.getValue();
 
-          output.println("   {");
-          output.println("   SESEcommon* oldSrc = "+lhs+"_srcSESE;");
-          
-         output.println("   "+lhs+"_srcSESE   = "+rhs+"_srcSESE;");
-         output.println("   "+lhs+"_srcOffset = "+rhs+"_srcOffset;");
-
-          // no matter what we did above, track reference count of whatever
-          // this variable pointed to, do release last in case we're just
-          // copying the same value in because 1->2->1 is safe but ref count
-          // 1->0->1 has a window where it looks like it should be free'd
-          output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-          output.println("     if( "+rhs+"_srcSESE != NULL ) {");
-          output.println("       ADD_REFERENCE_TO( "+rhs+"_srcSESE );");
-          output.println("     }");
-          output.println("     if( oldSrc != NULL ) {");
-          output.println("       RELEASE_REFERENCE_TO( oldSrc );");
-          output.println("     }");
-          output.println("   }");
-          output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-       }
+    additionalCodePreNode( fm, lb, fn, output );
 
-       // for each lhs that is dynamic from a non-dynamic source, set the
-       // dynamic source vars to the current SESE
-       dynItr = cp.getDynAssignCurr().iterator();
-       while( dynItr.hasNext() ) {
-         TempDescriptor dynVar = dynItr.next();          
-          assert currentSESE.getDynamicVarSet().contains( dynVar );
-
-          // first release a reference to current record
-          output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-          output.println("   if( "+dynVar+"_srcSESE != NULL ) {");
-          output.println("     RELEASE_REFERENCE_TO( oldSrc );");
-          output.println("   }");
-          output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-          output.println("   "+dynVar+"_srcSESE = NULL;");
-       }
-       
-        // eom
-        // handling stall site
-        if (state.OOOJAVA) {
-          // NEED TO FIX IT 
-          // assumes that there is only one parent, but it is possible that
-          // currentSESE has more than one so we need to generate
-          // conditional case for each parent case        
-          Analysis.OoOJava.ConflictGraph graph = null;
-          if(currentSESE.getSESEParent().size()>0){
-            graph = oooa.getConflictGraph(currentSESE.getSESEParent().iterator().next());
-          }          
-//          Analysis.OoOJava.ConflictGraph graph = oooa.getConflictGraph(currentSESE);
-          if(graph!=null){
-            Set<Analysis.OoOJava.SESELock> seseLockSet = oooa.getLockMappings(graph);
-            Set<Analysis.OoOJava.WaitingElement> waitingElementSet = graph.getStallSiteWaitingElementSet(fn, seseLockSet);
-            
-            if (waitingElementSet.size() > 0) {
-             if (state.RCR) {
-               stallMEMRCR(fm, fn, waitingElementSet, output);
-             } else {
-               output.println("// stall on parent's stall sites ");
-               output.println("   {");
-               output.println("     REntry* rentry;");
-               
-               for (Iterator iterator = waitingElementSet.iterator(); iterator.hasNext();) {
-                 Analysis.OoOJava.WaitingElement waitingElement =
-                   (Analysis.OoOJava.WaitingElement) iterator.next();
-                 if (waitingElement.getStatus() >= ConflictNode.COARSE) {
-                   output.println("     rentry=mlpCreateREntry(runningSESE->memoryQueueArray["
-                                  + waitingElement.getQueueID() + "]," + waitingElement.getStatus()
-                                  + ", runningSESE);");
-                 } else {
-                   output.println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["
-                                  + waitingElement.getQueueID() + "]," + waitingElement.getStatus()
-                                  + ", runningSESE,  (void*)&"
-                                  + generateTemp(fm, waitingElement.getTempDesc(), lb) + ");");
-                 }
-                 output.println("     rentry->parentStallSem=&runningSESEstallSem;");
-                 output.println("     psem_reset( &runningSESEstallSem);");
-                 output.println("     rentry->tag=runningSESEstallSem.tag;");
-                 output.println("     rentry->queue=runningSESE->memoryQueueArray["
-                                + waitingElement.getQueueID() + "];");
-                 output.println("     if(ADDRENTRY(runningSESE->memoryQueueArray["
-                                + waitingElement.getQueueID() + "],rentry)==NOTREADY){");
-                 if (state.COREPROF) {
-                   output.println("#ifdef CP_EVENTID_TASKSTALLMEM");
-                   output
-                      .println("        CP_LOGEVENT( CP_EVENTID_TASKSTALLMEM, CP_EVENTTYPE_BEGIN );");
-                   output.println("#endif");
-                 }
-                 
-                 output.println("       psem_take( &runningSESEstallSem, (struct garbagelist *)&___locals___ );");
-                 
-                 if (state.COREPROF) {
-                   output.println("#ifdef CP_EVENTID_TASKSTALLMEM");
-                   output
-                      .println("        CP_LOGEVENT( CP_EVENTID_TASKSTALLMEM, CP_EVENTTYPE_END );");
-                   output.println("#endif");
-                 }
-                 output.println("     }  ");
-               }
-               output.println("   }");
-             }
-           }
-         }
-        } else{
-          ParentChildConflictsMap conflictsMap = mlpa.getConflictsResults().get(fn);
-          if (conflictsMap != null) {
-            Set<Long> allocSet = conflictsMap.getAllocationSiteIDSetofStallSite();
-            if (allocSet.size() > 0) {
-              FlatNode enclosingFlatNode=null;
-              if( currentSESE.getIsCallerSESEplaceholder() && currentSESE.getParent()==null){
-                enclosingFlatNode=currentSESE.getfmEnclosing();
-              }else{
-                enclosingFlatNode=currentSESE;
-              }                                                
-              ConflictGraph graph=mlpa.getConflictGraphResults().get(enclosingFlatNode);
-              HashSet<SESELock> seseLockSet=mlpa.getConflictGraphLockMap().get(graph);
-              Set<WaitingElement> waitingElementSet=graph.getStallSiteWaitingElementSet(conflictsMap, seseLockSet);
-                       
-              if(waitingElementSet.size()>0){
-                output.println("// stall on parent's stall sites ");
-                output.println("   {");
-                output.println("     REntry* rentry;");
-                               
-                for (Iterator iterator = waitingElementSet.iterator(); iterator.hasNext();) {
-                  WaitingElement waitingElement = (WaitingElement) iterator.next();
-                                       
-                  if( waitingElement.getStatus() >= ConflictNode.COARSE ){
-                    // HERE! a parent might conflict with a child
-                    output.println("     rentry=mlpCreateREntry(runningSESE->memoryQueueArray["+ waitingElement.getQueueID()+ "],"+ waitingElement.getStatus()+ ", runningSESE);");
-                  } else {
-                    output.println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ waitingElement.getQueueID()+ "],"+ waitingElement.getStatus()+ ", runningSESE,  (void*)&___locals___."+ waitingElement.getDynID() + ");");
-                  }                                    
-                 output.println("     rentry->parentStallSem=&runningSESEstallSem;");
-                 output.println("     psem_reset( &runningSESEstallSem);");
-                 output.println("     rentry->tag=runningSESEstallSem.tag;");
-                  output.println("     rentry->queue=runningSESE->memoryQueueArray["+ waitingElement.getQueueID()+ "];");
-                  output.println("     if(ADDRENTRY(runningSESE->memoryQueueArray["+ waitingElement.getQueueID()+"],rentry)==NOTREADY) {");
-                  if( state.COREPROF ) {
-                    output.println("#ifdef CP_EVENTID_TASKSTALLMEM");
-                    output.println("        CP_LOGEVENT( CP_EVENTID_TASKSTALLMEM, CP_EVENTTYPE_BEGIN );");
-                    output.println("#endif");
-                  }
-                  output.println("        psem_take( &runningSESEstallSem, (struct garbagelist *)&___locals___ );");
-                  if( state.COREPROF ) {
-                    output.println("#ifdef CP_EVENTID_TASKSTALLMEM");
-                    output.println("        CP_LOGEVENT( CP_EVENTID_TASKSTALLMEM, CP_EVENTTYPE_END );");
-                    output.println("#endif");
-                  }
-                  output.println("     }  ");
-                }
-                output.println("   }");
-              }
-            }
-          }    
-       }
-      }
-    }
 
     switch(fn.kind()) {
     case FKind.FlatAtomicEnterNode:
@@ -3581,7 +2633,7 @@ public class BuildCode {
       if(state.DSM&&state.SANDBOX&&(locality.getAtomic(lb).get(fn).intValue()>0)) {
         output.println("if (unlikely((--transaction_check_counter)<=0)) checkObjects();");
       }
-      if (((state.MLP|| state.OOOJAVA||state.THREAD||state.DSM||state.SINGLETM)&&GENERATEPRECISEGC)
+      if (((state.OOOJAVA||state.THREAD||state.DSM||state.SINGLETM)&&GENERATEPRECISEGC)
           || (this.state.MULTICOREGC)) {
        if(state.DSM&&locality.getAtomic(lb).get(fn).intValue()>0) {
          output.println("if (needtocollect) checkcollect2("+localsprefixaddr+");");
@@ -3614,15 +2666,8 @@ public class BuildCode {
       throw new Error();
     }
 
-    // insert post-node actions from the code-plan
-    /*
-    if( state.MLP) {
-      CodePlan cp = mlpa.getCodePlan( fn );
 
-      if( cp != null ) {     
-      }
-    }
-    */
+    additionalCodePostNode( fm, lb, fn, output );
   }
 
   public void generateFlatOffsetNode(FlatMethod fm, LocalityBinding lb, FlatOffsetNode fofn, PrintWriter output) {
@@ -4001,901 +3046,16 @@ public class BuildCode {
                                         LocalityBinding lb, 
                                         FlatSESEEnterNode fsen, 
                                         PrintWriter output) {
-    // if MLP flag is off, okay that SESE nodes are in IR graph, 
-    // just skip over them and code generates exactly the same
-    if( !(state.MLP || state.OOOJAVA) ) {
-      return;
-    }    
-    // there may be an SESE in an unreachable method, skip over
-    if( (state.MLP && !mlpa.getAllSESEs().contains( fsen )) ||
-        (state.OOOJAVA && !oooa.getAllSESEs().contains(fsen))
-    ) {
-      return;
-    }
-
-    // also, if we have encountered a placeholder, just skip it
-    if( fsen.getIsCallerSESEplaceholder() ) {
-      return;
-    }
-
-    output.println("   {");
-
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_TASKDISPATCH");
-      output.println("     CP_LOGEVENT( CP_EVENTID_TASKDISPATCH, CP_EVENTTYPE_BEGIN );");
-      output.println("#endif");
-    }
-
-
-    // before doing anything, lock your own record and increment the running children
-    if( (state.MLP     && fsen != mlpa.getMainSESE()) || 
-        (state.OOOJAVA && fsen != oooa.getMainSESE())
-    ) {
-       output.println("     childSESE++;");
-    }
-
-    // allocate the space for this record
-    output.println( "#ifndef OOO_DISABLE_TASKMEMPOOL" );
-
-    output.println( "#ifdef CP_EVENTID_POOLALLOC");
-    output.println( "     CP_LOGEVENT( CP_EVENTID_POOLALLOC, CP_EVENTTYPE_BEGIN );");
-    output.println( "#endif");
-    if( (state.MLP     && fsen != mlpa.getMainSESE()) || 
-        (state.OOOJAVA && fsen != oooa.getMainSESE())
-        ) {
-      output.println("     "+
-                     fsen.getSESErecordName()+"* seseToIssue = ("+
-                     fsen.getSESErecordName()+"*) poolalloc( runningSESE->taskRecordMemPool );");
-      output.println("     CHECK_RECORD( seseToIssue );");
-    } else {
-      output.println("     "+
-                     fsen.getSESErecordName()+"* seseToIssue = ("+
-                     fsen.getSESErecordName()+"*) mlpAllocSESErecord( sizeof( "+
-                     fsen.getSESErecordName()+" ) );");
-    }
-    output.println( "#ifdef CP_EVENTID_POOLALLOC");
-    output.println( "     CP_LOGEVENT( CP_EVENTID_POOLALLOC, CP_EVENTTYPE_END );");
-    output.println( "#endif");
-
-    output.println( "#else // OOO_DISABLE_TASKMEMPOOL" );
-      output.println("     "+
-                     fsen.getSESErecordName()+"* seseToIssue = ("+
-                     fsen.getSESErecordName()+"*) mlpAllocSESErecord( sizeof( "+
-                     fsen.getSESErecordName()+" ) );");
-    output.println( "#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-
-    // set up the SESE in-set and out-set objects, which look
-    // like a garbage list
-    output.println("     struct garbagelist * gl= (struct garbagelist *)&(((SESEcommon*)(seseToIssue))[1]);");
-    output.println("     gl->size="+calculateSizeOfSESEParamList(fsen)+";");
-    output.println("     gl->next = NULL;");
-    output.println("     seseToIssue->common.rentryIdx=0;");
-
-    if(state.RCR) {
-      //flag the SESE status as 1...it will be reset
-      output.println("     seseToIssue->common.rcrstatus=1;");
-    }
-
-    // there are pointers to SESE records the newly-issued SESE
-    // will use to get values it depends on them for--how many
-    // are there, and what is the offset from the total SESE
-    // record to the first dependent record pointer?
-    output.println("     seseToIssue->common.numDependentSESErecords="+
-                   fsen.getNumDepRecs()+";");
-    
-    // we only need this (and it will only compile) when the number of dependent
-    // SESE records is non-zero
-    if( fsen.getFirstDepRecField() != null ) {
-      output.println("     seseToIssue->common.offsetToDepSESErecords=(INTPTR)sizeof("+
-                     fsen.getSESErecordName()+") - (INTPTR)&((("+
-                     fsen.getSESErecordName()+"*)0)->"+fsen.getFirstDepRecField()+");"
-                     );
-    }
-    
-    if (state.RCR&&fsen.getInVarsForDynamicCoarseConflictResolution().size()>0) {
-      output.println("    seseToIssue->common.offsetToParamRecords=(INTPTR) & ((("+fsen.getSESErecordName()+"*)0)->rcrRecords);");
-    }
-
-    // fill in common data
-    output.println("     int localCount=0;");
-    output.println("     seseToIssue->common.classID = "+fsen.getIdentifier()+";");
-    output.println("     seseToIssue->common.unresolvedDependencies = 10000;");
-    output.println("     seseToIssue->common.parentsStallSem = NULL;");
-    output.println("     initQueue(&seseToIssue->common.forwardList);");
-    output.println("     seseToIssue->common.doneExecuting = FALSE;");    
-    output.println("     seseToIssue->common.numRunningChildren = 0;");
-    output.println( "#ifdef OOO_DISABLE_TASKMEMPOOL" );
-    output.println("     pthread_cond_init( &(seseToIssue->common.runningChildrenCond), NULL );");
-    output.println("#endif");
-    output.println("     seseToIssue->common.parent = runningSESE;");
-    // start with refCount = 2, one being the count that the child itself
-    // will decrement when it retires, to say it is done using its own
-    // record, and the other count is for the parent that will remember
-    // the static name of this new child below
-    if( state.RCR ) {
-      // if we're using RCR, ref count is 3 because the traverser has
-      // a reference, too
-      if( fsen != oooa.getMainSESE() && fsen.getInVarsForDynamicCoarseConflictResolution().size()>0){
-        output.println("     seseToIssue->common.refCount = 10003;");
-      } else {
-        output.println("     seseToIssue->common.refCount = 10002;");
-      }
-      output.println("     int refCount=10000;");
-    } else {
-      output.println("     seseToIssue->common.refCount = 2;");
-    }
-
-    // all READY in-vars should be copied now and be done with it
-    Iterator<TempDescriptor> tempItr = fsen.getReadyInVarSet().iterator();
-    while( tempItr.hasNext() ) {
-      TempDescriptor temp = tempItr.next();
-
-      // when we are issuing the main SESE or an SESE with placeholder
-      // caller SESE as parent, generate temp child child's eclosing method,
-      // otherwise use the parent's enclosing method as the context
-      boolean useParentContext = false;
-
-      if( (state.MLP && fsen != mlpa.getMainSESE()) || 
-          (state.OOOJAVA && fsen != oooa.getMainSESE())     
-      ) {
-       assert fsen.getParent() != null;
-       if( !fsen.getParent().getIsCallerSESEplaceholder() ) {
-         useParentContext = true;
-       }
-      }
-
-      if( useParentContext ) {
-       output.println("     seseToIssue->"+temp+" = "+
-                      generateTemp( fsen.getParent().getfmBogus(), temp, null )+";");   
-      } else {
-       output.println("     seseToIssue->"+temp+" = "+
-                      generateTemp( fsen.getfmEnclosing(), temp, null )+";");
-      }
-    }
-    
-    // before potentially adding this SESE to other forwarding lists,
-    // create it's lock
-    output.println( "#ifdef OOO_DISABLE_TASKMEMPOOL" );
-    output.println("     pthread_mutex_init( &(seseToIssue->common.lock), NULL );");
-    output.println("#endif");
-  
-    if( (state.MLP && fsen != mlpa.getMainSESE()) ||
-        (state.OOOJAVA && fsen != oooa.getMainSESE())    
-    ) {
-      // count up outstanding dependencies, static first, then dynamic
-      Iterator<SESEandAgePair> staticSrcsItr = fsen.getStaticInVarSrcs().iterator();
-      while( staticSrcsItr.hasNext() ) {
-       SESEandAgePair srcPair = staticSrcsItr.next();
-       output.println("     {");
-       output.println("       SESEcommon* src = (SESEcommon*)"+srcPair+";");
-       output.println("       pthread_mutex_lock( &(src->lock) );");
-        // FORWARD TODO
-       output.println("       if( !src->doneExecuting ) {");
-        output.println("         addNewItem( &src->forwardList, seseToIssue );");      
-       output.println("         ++(localCount);");
-       output.println("       }");
-        output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-        output.println("       ADD_REFERENCE_TO( src );");
-        output.println("#endif" );
-       output.println("       pthread_mutex_unlock( &(src->lock) );");
-       output.println("     }");
-
-       // whether or not it is an outstanding dependency, make sure
-       // to pass the static name to the child's record
-       output.println("     seseToIssue->"+srcPair+" = "+
-                       "("+srcPair.getSESE().getSESErecordName()+"*)"+
-                       srcPair+";");
-      }
-      
-      // dynamic sources might already be accounted for in the static list,
-      // so only add them to forwarding lists if they're not already there
-      Iterator<TempDescriptor> dynVarsItr = fsen.getDynamicInVarSet().iterator();
-      while( dynVarsItr.hasNext() ) {
-       TempDescriptor dynInVar = dynVarsItr.next();
-       output.println("     {");
-       output.println("       SESEcommon* src = (SESEcommon*)"+dynInVar+"_srcSESE;");
-
-       // the dynamic source is NULL if it comes from your own space--you can't pass
-       // the address off to the new child, because you're not done executing and
-       // might change the variable, so copy it right now
-       output.println("       if( src != NULL ) {");
-       output.println("         pthread_mutex_lock( &(src->lock) );");
-
-        // FORWARD TODO
-
-       output.println("         if( isEmpty( &src->forwardList ) ||");
-       output.println("             seseToIssue != peekItem( &src->forwardList ) ) {");
-       output.println("           if( !src->doneExecuting ) {");
-       output.println("             addNewItem( &src->forwardList, seseToIssue );");
-       output.println("             ++(localCount);");
-       output.println("           }");
-       output.println("         }");
-        output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-        output.println("         ADD_REFERENCE_TO( src );");
-        output.println("#endif" );
-       output.println("         pthread_mutex_unlock( &(src->lock) );");       
-       output.println("         seseToIssue->"+dynInVar+"_srcOffset = "+dynInVar+"_srcOffset;");
-       output.println("       } else {");
-
-       boolean useParentContext = false;
-       if( (state.MLP && fsen != mlpa.getMainSESE()) || 
-           (state.OOOJAVA && fsen != oooa.getMainSESE())       
-       ) {
-         assert fsen.getParent() != null;
-         if( !fsen.getParent().getIsCallerSESEplaceholder() ) {
-           useParentContext = true;
-         }
-       }       
-       if( useParentContext ) {
-         output.println("         seseToIssue->"+dynInVar+" = "+
-                        generateTemp( fsen.getParent().getfmBogus(), dynInVar, null )+";");
-       } else {
-         output.println("         seseToIssue->"+dynInVar+" = "+
-                        generateTemp( fsen.getfmEnclosing(), dynInVar, null )+";");
-       }
-       
-       output.println("       }");
-       output.println("     }");
-       
-       // even if the value is already copied, make sure your NULL source
-       // gets passed so child knows it already has the dynamic value
-       output.println("     seseToIssue->"+dynInVar+"_srcSESE = "+dynInVar+"_srcSESE;");
-      }
-
-      
-
-
-      // maintain pointers for finding dynamic SESE 
-      // instances from static names      
-      SESEandAgePair pairNewest = new SESEandAgePair( fsen, 0 );
-      SESEandAgePair pairOldest = new SESEandAgePair( fsen, fsen.getOldestAgeToTrack() );
-      if(  fsen.getParent() != null && 
-          fsen.getParent().getNeededStaticNames().contains( pairNewest ) 
-       ) {       
-        output.println("     {");
-        output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-        output.println("       SESEcommon* oldest = "+pairOldest+";");
-        output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-       for( int i = fsen.getOldestAgeToTrack(); i > 0; --i ) {
-         SESEandAgePair pair1 = new SESEandAgePair( fsen, i   );
-         SESEandAgePair pair2 = new SESEandAgePair( fsen, i-1 );
-         output.println("       "+pair1+" = "+pair2+";");
-       }      
-       output.println("       "+pairNewest+" = &(seseToIssue->common);");
-
-        // no need to add a reference to whatever is the newest record, because
-        // we initialized seseToIssue->refCount to *2*
-        // but release a reference to whatever was the oldest BEFORE the shift
-        output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-        output.println("       if( oldest != NULL ) {");
-        output.println("         RELEASE_REFERENCE_TO( oldest );");
-        output.println("       }");
-        output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-        output.println("     }");
-      }
-
-      if( state.COREPROF ) {
-        output.println("#ifdef CP_EVENTID_PREPAREMEMQ");
-        output.println("     CP_LOGEVENT( CP_EVENTID_PREPAREMEMQ, CP_EVENTTYPE_BEGIN );");
-        output.println("#endif");
-      }
-
-
-      ////////////////
-      // count up memory conflict dependencies,
-      if(state.RCR) {
-        dispatchMEMRC(fm, lb, fsen, output);
-      } else if(state.OOOJAVA){
-        // NEED TO FIX IT 
-        // assumes that there is only one parent, but it is possible that
-        // currentSESE has more than one so we need to generate
-        // conditional case for each parent case        
-        assert fsen.getSESEParent().size()>0;
-        FlatSESEEnterNode parent =  fsen.getSESEParent().iterator().next();
-        Analysis.OoOJava.ConflictGraph graph = oooa.getConflictGraph(parent);        
-        if (graph != null && graph.hasConflictEdge()) {
-          Set<Analysis.OoOJava.SESELock> seseLockSet = oooa.getLockMappings(graph);
-          output.println();
-          output.println("     //add memory queue element");
-          Analysis.OoOJava.SESEWaitingQueue seseWaitingQueue=
-            graph.getWaitingElementSetBySESEID(fsen.getIdentifier(), seseLockSet);
-          if(seseWaitingQueue.getWaitingElementSize()>0) {
-            output.println("     {");
-            output.println("       REntry* rentry=NULL;");
-            output.println("       INTPTR* pointer=NULL;");
-            output.println("       seseToIssue->common.rentryIdx=0;");
-
-            Set<Integer> queueIDSet=seseWaitingQueue.getQueueIDSet();
-            for (Iterator iterator = queueIDSet.iterator(); iterator.hasNext();) {
-              Integer key = (Integer) iterator.next();
-              int queueID=key.intValue();
-              Set<Analysis.OoOJava.WaitingElement> waitingQueueSet =  
-                seseWaitingQueue.getWaitingElementSet(queueID);
-              int enqueueType=seseWaitingQueue.getType(queueID);
-              if(enqueueType==SESEWaitingQueue.EXCEPTION) {
-                output.println("       INITIALIZEBUF(runningSESE->memoryQueueArray[" + queueID+ "]);");
-              }
-              for (Iterator iterator2 = waitingQueueSet.iterator(); iterator2.hasNext();) {
-                Analysis.OoOJava.WaitingElement waitingElement 
-                  = (Analysis.OoOJava.WaitingElement) iterator2.next();
-                if (waitingElement.getStatus() >= ConflictNode.COARSE) {
-                  output.println("       rentry=mlpCreateREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                                 + waitingElement.getStatus()
-                                 + ", &(seseToIssue->common));");
-                } else {
-                  TempDescriptor td = waitingElement.getTempDesc();
-                  // decide whether waiting element is dynamic or static
-                  if (fsen.getDynamicInVarSet().contains(td)) {
-                    // dynamic in-var case
-                    output.println("       pointer=seseToIssue->"
-                                   + waitingElement.getDynID()
-                                   + "_srcSESE+seseToIssue->"
-                                   + waitingElement.getDynID()
-                                   + "_srcOffset;");
-                    output.println("       rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                                   + waitingElement.getStatus()
-                                   + ", &(seseToIssue->common),  pointer );");
-                  } else if (fsen.getStaticInVarSet().contains(td)) {
-                    // static in-var case
-                    VariableSourceToken vst = fsen.getStaticInVarSrc(td);
-                    if (vst != null) {
-  
-                      String srcId = "SESE_" + vst.getSESE().getPrettyIdentifier()
-                        + vst.getSESE().getIdentifier()
-                        + "_" + vst.getAge();
-                      output.println("       pointer=(void*)&seseToIssue->"
-                                     + srcId
-                                     + "->"
-                                     + waitingElement
-                                     .getDynID()
-                                     + ";");
-                      output.println("       rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                                     + waitingElement.getStatus()
-                                     + ", &(seseToIssue->common),  pointer );");
-                    }
-                  } else {
-                    output.println("       rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                                   + waitingElement.getStatus()
-                                   + ", &(seseToIssue->common), (void*)&seseToIssue->"
-                                   + waitingElement.getDynID()
-                                   + ");");
-                  }
-                }
-                output.println("       rentry->queue=runningSESE->memoryQueueArray["
-                               + waitingElement.getQueueID()
-                               + "];");
-                
-                if(enqueueType==SESEWaitingQueue.NORMAL){
-                  output.println("       seseToIssue->common.rentryArray[seseToIssue->common.rentryIdx++]=rentry;");
-                  output.println("       if(ADDRENTRY(runningSESE->memoryQueueArray["
-                                 + waitingElement.getQueueID()
-                                 + "],rentry)==NOTREADY) {");
-                  output.println("          localCount++;");
-                  output.println("       }");
-               } else {
-                  output.println("       ADDRENTRYTOBUF(runningSESE->memoryQueueArray[" + waitingElement.getQueueID() + "],rentry);");
-                }
-              }
-              if(enqueueType!=SESEWaitingQueue.NORMAL){
-                output.println("       localCount+=RESOLVEBUF(runningSESE->memoryQueueArray["
-                               + queueID+ "],&seseToIssue->common);");
-              }       
-            }
-            output.println("     }");
-          }
-          output.println();
-        }
-      } else {
-       ConflictGraph graph = null;
-       FlatSESEEnterNode parent = fsen.getParent();
-       if (parent != null) {
-          if (parent.isCallerSESEplaceholder) {
-            graph = mlpa.getConflictGraphResults().get(parent.getfmEnclosing());
-          } else {
-            graph = mlpa.getConflictGraphResults().get(parent);
-          }
-       }
-        if (graph != null && graph.hasConflictEdge()) {
-          HashSet<SESELock> seseLockSet = mlpa.getConflictGraphLockMap()
-            .get(graph);
-          output.println();
-          output.println("     //add memory queue element");
-          SESEWaitingQueue seseWaitingQueue=graph.getWaitingElementSetBySESEID(fsen.getIdentifier(),
-                                                                               seseLockSet);
-          if(seseWaitingQueue.getWaitingElementSize()>0){
-            output.println("     {");
-            output.println("     REntry* rentry=NULL;");
-            output.println("     INTPTR* pointer=NULL;");
-            output.println("     seseToIssue->common.rentryIdx=0;");
-
-            Set<Integer> queueIDSet=seseWaitingQueue.getQueueIDSet();
-            for (Iterator iterator = queueIDSet.iterator(); iterator
-                   .hasNext();) {
-              Integer key = (Integer) iterator.next();
-              int queueID=key.intValue();
-              Set<WaitingElement> waitingQueueSet =  seseWaitingQueue.getWaitingElementSet(queueID);
-              int enqueueType=seseWaitingQueue.getType(queueID);
-              if(enqueueType==SESEWaitingQueue.EXCEPTION){
-                output.println("     INITIALIZEBUF(runningSESE->memoryQueueArray["
-                               + queueID+ "]);");
-              }
-              for (Iterator iterator2 = waitingQueueSet.iterator(); iterator2
-                     .hasNext();) {
-                WaitingElement waitingElement = (WaitingElement) iterator2
-                  .next();
-                if (waitingElement.getStatus() >= ConflictNode.COARSE) {
-                  output.println("     rentry=mlpCreateREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                                 + waitingElement.getStatus()
-                                 + ", &(seseToIssue->common));");
-                } else {
-                  TempDescriptor td = waitingElement
-                    .getTempDesc();
-                  // decide whether waiting element is dynamic or
-                  // static
-                  if (fsen.getDynamicInVarSet().contains(td)) {
-                    // dynamic in-var case
-                    output.println("     pointer=seseToIssue->"
-                                   + waitingElement.getDynID()
-                                   + "_srcSESE+seseToIssue->"
-                                   + waitingElement.getDynID()
-                                   + "_srcOffset;");
-                    output
-                      .println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                               + waitingElement
-                               .getStatus()
-                               + ", &(seseToIssue->common),  pointer );");
-                  } else if (fsen.getStaticInVarSet()
-                             .contains(td)) {
-                    // static in-var case
-                    VariableSourceToken vst = fsen
-                      .getStaticInVarSrc(td);
-                    if (vst != null) {
-  
-                      String srcId = "SESE_"
-                        + vst.getSESE()
-                        .getPrettyIdentifier()
-                        + vst.getSESE().getIdentifier()
-                        + "_" + vst.getAge();
-                      output
-                        .println("     pointer=(void*)&seseToIssue->"
-                                 + srcId
-                                 + "->"
-                                 + waitingElement
-                                 .getDynID()
-                                 + ";");
-                      output
-                        .println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                                 + waitingElement
-                                 .getStatus()
-                                 + ", &(seseToIssue->common),  pointer );");
-  
-                    }
-                  } else {
-                    output
-                      .println("     rentry=mlpCreateFineREntry(runningSESE->memoryQueueArray["+ queueID+ "],"
-                               + waitingElement
-                               .getStatus()
-                               + ", &(seseToIssue->common),  (void*)&seseToIssue->"
-                               + waitingElement.getDynID()
-                               + ");");
-                  }
-                }
-                output
-                  .println("     rentry->queue=runningSESE->memoryQueueArray["
-                           + waitingElement.getQueueID()
-                           + "];");
-                                                       
-                if(enqueueType==SESEWaitingQueue.NORMAL){
-                  output
-                    .println("     seseToIssue->common.rentryArray[seseToIssue->common.rentryIdx++]=rentry;");
-                  output
-                    .println("     if(ADDRENTRY(runningSESE->memoryQueueArray["
-                             + waitingElement.getQueueID()
-                             + "],rentry)==NOTREADY){");
-                  output.println("        ++(localCount);");
-                  output.println("     } ");
-                }else{
-                  output
-                    .println("     ADDRENTRYTOBUF(runningSESE->memoryQueueArray["
-                             + waitingElement.getQueueID()
-                             + "],rentry);");
-                }
-              }
-              if(enqueueType!=SESEWaitingQueue.NORMAL){
-                output.println("     localCount+=RESOLVEBUF(runningSESE->memoryQueueArray["
-                               + queueID+ "],&seseToIssue->common);");
-              }
-            }
-            output.println("     }");
-          }
-          output.println();
-        }
-      }
-    }
-
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_PREPAREMEMQ");
-      output.println("     CP_LOGEVENT( CP_EVENTID_PREPAREMEMQ, CP_EVENTTYPE_END );");
-      output.println("#endif");
-    }
-
-    // Enqueue Task Record
-    if (state.RCR) {
-      if( fsen != oooa.getMainSESE() && fsen.getInVarsForDynamicCoarseConflictResolution().size()>0){
-        output.println("    enqueueTR(TRqueue, (void *)seseToIssue);");
-      }
-    }
-
-    // if there were no outstanding dependencies, issue here
-    output.println("     if(  atomic_sub_and_test(10000-localCount,&(seseToIssue->common.unresolvedDependencies) ) ) {");
-    output.println("       workScheduleSubmit( (void*)seseToIssue );");
-    output.println("     }");
-
-    
-
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_TASKDISPATCH");
-      output.println("     CP_LOGEVENT( CP_EVENTID_TASKDISPATCH, CP_EVENTTYPE_END );");
-      output.println("#endif");
-    }
-
-    output.println("   }");
-    
-  }
-
-  void dispatchMEMRC(FlatMethod fm,  LocalityBinding lb, FlatSESEEnterNode fsen, PrintWriter output) {
-    // NEED TO FIX IT 
-    // assumes that there is only one parent, but it is possible that
-    // currentSESE has more than one so we need to generate
-    // conditional case for each parent case        
-    assert fsen.getSESEParent().size()>0;
-    FlatSESEEnterNode parent =  fsen.getSESEParent().iterator().next();
-    Analysis.OoOJava.ConflictGraph graph = oooa.getConflictGraph(parent);
-    if (graph != null && graph.hasConflictEdge()) {
-      Set<Analysis.OoOJava.SESELock> seseLockSet = oooa.getLockMappings(graph);
-      Analysis.OoOJava.SESEWaitingQueue seseWaitingQueue=graph.getWaitingElementSetBySESEID(fsen.getIdentifier(), seseLockSet);
-      if(seseWaitingQueue.getWaitingElementSize()>0) {
-       output.println("     {");
-       output.println("       REntry* rentry=NULL;");
-       output.println("       INTPTR* pointer=NULL;");
-       output.println("       seseToIssue->common.rentryIdx=0;");
-       Vector<TempDescriptor> invars=fsen.getInVarsForDynamicCoarseConflictResolution();
-       System.out.println(fm.getMethod()+"["+invars+"]");
-       
-       Vector<Long> queuetovar=new Vector<Long>();
-
-       for(int i=0;i<invars.size();i++) {
-         TempDescriptor td=invars.get(i);
-         Set<Analysis.OoOJava.WaitingElement> weset=seseWaitingQueue.getWaitingElementSet(td);
-         int numqueues=0;
-         Set<Integer> queueSet=new HashSet<Integer>();
-         for (Iterator iterator = weset.iterator(); iterator.hasNext();) {
-           Analysis.OoOJava.WaitingElement  we = (Analysis.OoOJava.WaitingElement) iterator.next();
-           Integer queueID=new Integer( we.getQueueID());
-           if(!queueSet.contains(queueID)){
-             numqueues++;
-             queueSet.add(queueID);
-           }      
-    }
-    output.println("      seseToIssue->rcrRecords["+i+"].flag="+numqueues+";");
-    output.println("      seseToIssue->rcrRecords["+i+"].index=0;");
-    output.println("      seseToIssue->rcrRecords["+i+"].next=NULL;");
-    output.println("      int dispCount"+i+"=0;");
-
-    for (Iterator<Analysis.OoOJava.WaitingElement> wtit = weset.iterator(); wtit.hasNext();) {
-      Analysis.OoOJava.WaitingElement waitingElement = wtit.next();
-      int queueID = waitingElement.getQueueID();
-      if (queueID >= queuetovar.size())
-        queuetovar.setSize(queueID + 1);
-      Long l = queuetovar.get(queueID);
-      long val = (l != null) ? l.longValue() : 0;
-      val = val | (1 << i);
-      queuetovar.set(queueID, new Long(val));
-    }
-       }
-
-       HashSet generatedqueueentry=new HashSet();
-       for(int i=0;i<invars.size();i++) {
-         TempDescriptor td=invars.get(i);
-         Set<Analysis.OoOJava.WaitingElement> weset=seseWaitingQueue.getWaitingElementSet(td);
-         for(Iterator<Analysis.OoOJava.WaitingElement> wtit=weset.iterator();wtit.hasNext();) {
-           Analysis.OoOJava.WaitingElement waitingElement=wtit.next();
-           int queueID=waitingElement.getQueueID();
-           
-           if(waitingElement.isBogus()){
-             continue;
-           }
-           
-           if (generatedqueueentry.contains(queueID))
-             continue;
-           else 
-             generatedqueueentry.add(queueID);
-
-           assert(waitingElement.getStatus()>=ConflictNode.COARSE);
-           long mask=queuetovar.get(queueID);
-           output.println("       rentry=mlpCreateREntry(runningSESE->memoryQueueArray["+ waitingElement.getQueueID()+ "]," + waitingElement.getStatus() + ", &(seseToIssue->common), "+mask+"LL);");
-           output.println("       rentry->count=2;");
-           output.println("       seseToIssue->common.rentryArray[seseToIssue->common.rentryIdx++]=rentry;");
-           output.println("       rentry->queue=runningSESE->memoryQueueArray[" + waitingElement.getQueueID()+"];");
-           
-           output.println("       if(ADDRENTRY(runningSESE->memoryQueueArray["+ waitingElement.getQueueID()+ "],rentry)==READY) {");
-           for(int j=0;mask!=0;j++) {
-             if ((mask&1)==1)
-               output.println("          dispCount"+j+"++;");
-             mask=mask>>1;
-           }
-           output.println("       } else ");
-           output.println("         refCount--;");
-
-         }
-
-         if (fsen.getDynamicInVarSet().contains(td)) {
-           // dynamic in-var case
-           //output.println("       pointer=seseToIssue->" + waitingElement.getDynID()+ "_srcSESE+seseToIssue->"+ waitingElement.getDynID()+ "_srcOffset;");
-           //output.println("       rentry=mlpCreateFineREntry("+ waitingElement.getStatus()+ ", &(seseToIssue->common),  pointer );");
-         }
-       }
-       for(int i=0;i<invars.size();i++) {
-         output.println("     if(!dispCount"+i+" || !atomic_sub_and_test(dispCount"+i+",&(seseToIssue->rcrRecords["+i+"].flag)))");
-         output.println("       localCount++;");
-       }
-       output.println("    }");
-      }
-    }
-    output.println("#ifndef OOO_DISABLE_TASKMEMPOOL");
-    output.println("  RELEASE_REFERENCES_TO((SESEcommon *)seseToIssue, refCount);");
-    output.println("#endif");
+    // if OOOJAVA flag is off, okay that SESE nodes are in IR graph, 
+    // just skip over them and code generates exactly the same    
   }
 
   public void generateFlatSESEExitNode( FlatMethod fm,
                                        LocalityBinding lb,
                                        FlatSESEExitNode fsexn,
                                        PrintWriter output) {
-
-    // if MLP flag is off, okay that SESE nodes are in IR graph, 
+    // if OOOJAVA flag is off, okay that SESE nodes are in IR graph, 
     // just skip over them and code generates exactly the same 
-    if( ! (state.MLP || state.OOOJAVA) ) {
-      return;
-    }
-
-    // get the enter node for this exit that has meta data embedded
-    FlatSESEEnterNode fsen = fsexn.getFlatEnter();
-
-    // there may be an SESE in an unreachable method, skip over
-    if( (state.MLP && !mlpa.getAllSESEs().contains( fsen ))  ||
-        (state.OOOJAVA && !oooa.getAllSESEs().contains( fsen ))
-    ) {
-      return;
-    }
-
-    // also, if we have encountered a placeholder, just jump it
-    if( fsen.getIsCallerSESEplaceholder() ) {
-      return;
-    }
-    
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_TASKEXECUTE");
-      output.println("   CP_LOGEVENT( CP_EVENTID_TASKEXECUTE, CP_EVENTTYPE_END );");
-      output.println("#endif");
-    }
-
-    output.println("   /* SESE exiting */");
-
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_TASKRETIRE");
-      output.println("   CP_LOGEVENT( CP_EVENTID_TASKRETIRE, CP_EVENTTYPE_BEGIN );");
-      output.println("#endif");
-    }
-    
-
-    // this SESE cannot be done until all of its children are done
-    // so grab your own lock with the condition variable for watching
-    // that the number of your running children is greater than zero    
-    output.println("   atomic_add(childSESE, &runningSESE->numRunningChildren);");
-    output.println("   pthread_mutex_lock( &(runningSESE->lock) );");
-    output.println("   if( runningSESE->numRunningChildren > 0 ) {");
-    output.println("     stopforgc( (struct garbagelist *)&___locals___ );");
-    output.println("     do {");
-    output.println("       pthread_cond_wait( &(runningSESE->runningChildrenCond), &(runningSESE->lock) );");
-    output.println("     } while( runningSESE->numRunningChildren > 0 );");
-    output.println("     restartaftergc();");
-    output.println("   }");
-
-
-    // copy out-set from local temps into the sese record
-    Iterator<TempDescriptor> itr = fsen.getOutVarSet().iterator();
-    while( itr.hasNext() ) {
-      TempDescriptor temp = itr.next();
-
-      // only have to do this for primitives non-arrays
-      if( !(
-            temp.getType().isPrimitive() && !temp.getType().isArray()
-           )
-        ) {
-       continue;
-      }
-
-      // have to determine the context enclosing this sese
-      boolean useParentContext = false;
-
-      if( (state.MLP &&fsen != mlpa.getMainSESE()) || 
-          (state.OOOJAVA &&fsen != oooa.getMainSESE())
-      ) {
-       assert fsen.getParent() != null;
-       if( !fsen.getParent().getIsCallerSESEplaceholder() ) {
-         useParentContext = true;
-       }
-      }
-
-      String from;
-      if( useParentContext ) {
-       from = generateTemp( fsen.getParent().getfmBogus(), temp, null );
-      } else {
-       from = generateTemp( fsen.getfmEnclosing(),         temp, null );
-      }
-
-      output.println("   "+paramsprefix+
-                    "->"+temp.getSafeSymbol()+
-                    " = "+from+";");
-    }    
-    
-    // mark yourself done, your task data is now read-only
-    output.println("   runningSESE->doneExecuting = TRUE;");
-
-    // if parent is stalling on you, let them know you're done
-    if( (state.MLP && fsexn.getFlatEnter() != mlpa.getMainSESE()) || 
-        (state.OOOJAVA &&  fsexn.getFlatEnter() != oooa.getMainSESE())    
-    ) {
-      output.println("   if( runningSESE->parentsStallSem != NULL ) {");
-      output.println("     psem_give( runningSESE->parentsStallSem );");
-      output.println("   }");
-    }
-
-    output.println("   pthread_mutex_unlock( &(runningSESE->lock) );");
-
-    // decrement dependency count for all SESE's on your forwarding list
-
-    // FORWARD TODO
-    output.println("   while( !isEmpty( &runningSESE->forwardList ) ) {");
-    output.println("     SESEcommon* consumer = (SESEcommon*) getItem( &runningSESE->forwardList );");
-    
-   
-    if (!state.RCR) {
-      output.println("     if(consumer->rentryIdx>0){");
-      output.println("        // resolved null pointer");
-      output.println("        int idx;");
-      output.println("        for(idx=0;idx<consumer->rentryIdx;idx++){");
-      output.println("           resolvePointer(consumer->rentryArray[idx]);");
-      output.println("        }");
-      output.println("     }");
-    }
-
-    output.println("     if( atomic_sub_and_test( 1, &(consumer->unresolvedDependencies) ) ){");
-    output.println("       workScheduleSubmit( (void*)consumer );");
-    output.println("     }");
-    output.println("   }");
-    
-    
-    // clean up its lock element from waiting queue, and decrement dependency count for next SESE block
-    if((state.MLP && fsen != mlpa.getMainSESE()) ||
-       (state.OOOJAVA && fsen != oooa.getMainSESE())) {
-      output.println();
-      output.println("   /* check memory dependency*/");
-      output.println("  {");
-      output.println("      int idx;");
-      output.println("      for(idx=0;idx<___params___->common.rentryIdx;idx++){");
-      output.println("           REntry* re=___params___->common.rentryArray[idx];");
-      output.println("           RETIRERENTRY(re->queue,re);");
-      output.println("      }");
-      output.println("   }");
-    }
-    
-    Vector<TempDescriptor> inset=fsen.getInVarsForDynamicCoarseConflictResolution();
-    if (state.RCR && inset.size() > 0) {
-      /* Make sure the running SESE is finished */
-      output.println("   if (unlikely(runningSESE->rcrstatus!=0)) {");
-      output.println("     if(CAS(&runningSESE->rcrstatus,1,0)==2) {");
-      output.println("       while(runningSESE->rcrstatus) {");
-      output.println("         BARRIER();");
-      output.println("         sched_yield();");
-      output.println("       }");
-      output.println("     }");
-      output.println("   }");
-      output.println("{");
-      output.println("  int idx,idx2;");
-
-      output.println("    struct rcrRecord *rec;");
-      output
-          .println("    struct Hashtable_rcr ** hashstruct=runningSESE->parent->allHashStructures;");
-
-      for (int i = 0; i < inset.size(); i++) {
-        output.println("    rec=&" + paramsprefix + "->rcrRecords[" + i + "];");
-        output.println("    while(rec!=NULL) {");
-        output.println("      for(idx2=0;idx2<rec->index;idx2++) {");
-
-        int weaklyConnectedComponentIndex = rcr.getWeakID(inset.get(i), fsen);
-
-        output.println("        rcr_RETIREHASHTABLE(hashstruct[" + weaklyConnectedComponentIndex
-            + "],&(___params___->common), rec->array[idx2], (BinItem_rcr *) rec->ptrarray[idx2]);");
-
-        output.println("      }");// exit idx2 for loop
-        output.println("      rec=rec->next;");
-        output.println("    }");// exit rec while loop
-      }
-      output.println("}");
-    }
-
-
-    // a task has variables to track static/dynamic instances
-    // that serve as sources, release the parent's ref of each
-    // non-null var of these types
-    output.println("   // releasing static SESEs");
-    output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-    Iterator<SESEandAgePair> pItr = fsen.getNeededStaticNames().iterator();
-    while( pItr.hasNext() ) {
-      SESEandAgePair pair = pItr.next();
-      output.println("   if( "+pair+" != NULL ) {");
-      output.println("     RELEASE_REFERENCE_TO( "+pair+" );");
-      output.println("   }");
-    }
-    output.println("   // releasing dynamic variable sources");
-    Iterator<TempDescriptor> dynSrcItr = fsen.getDynamicVarSet().iterator();
-    while( dynSrcItr.hasNext() ) {
-      TempDescriptor dynSrcVar = dynSrcItr.next();
-      output.println("   if( "+dynSrcVar+"_srcSESE != NULL ) {");
-      output.println("     RELEASE_REFERENCE_TO( "+dynSrcVar+"_srcSESE );");
-      output.println("   }");
-    }    
-    // destroy this task's mempool if it is not a leaf task
-    if( !fsen.getIsLeafSESE() ) {
-      output.println("     pooldestroy( runningSESE->taskRecordMemPool );");
-      if (state.RCR && fsen.getInVarsForDynamicCoarseConflictResolution().size() > 0 ) {
-        output.println("     returnTR();");
-      }
-    }
-    output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-
-    output.println("{");
-    output.println("SESEcommon *myparent=runningSESE->parent;");
-
-    // if this is not the Main sese (which has no parent) then return
-    // THIS task's record to the PARENT'S task record pool, and only if
-    // the reference count is now zero
-    if( (state.MLP     && fsen != mlpa.getMainSESE()) || 
-        (state.OOOJAVA && fsen != oooa.getMainSESE())
-        ) {
-      output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-      output.println("   RELEASE_REFERENCE_TO( runningSESE );");
-      output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-    } else {
-      // the main task has no parent, just free its record
-      output.println("   mlpFreeSESErecord( runningSESE );");
-    }
-
-
-    // last of all, decrement your parent's number of running children    
-    output.println("   if( myparent != NULL ) {");
-    output.println("     if( atomic_sub_and_test( 1, &(myparent->numRunningChildren) ) ) {");
-    output.println("       pthread_mutex_lock  ( &(myparent->lock) );");
-    output.println("       pthread_cond_signal ( &(myparent->runningChildrenCond) );");
-    output.println("       pthread_mutex_unlock( &(myparent->lock) );");
-    output.println("     }");
-    output.println("   }");
-
-    output.println("}");
-    
-    // as this thread is wrapping up the task, make sure the thread-local var
-    // for the currently running task record references an invalid task
-    output.println("   runningSESE = (SESEcommon*) 0x1;");
-
-    if( state.COREPROF ) {
-      output.println("#ifdef CP_EVENTID_TASKRETIRE");
-      output.println("   CP_LOGEVENT( CP_EVENTID_TASKRETIRE, CP_EVENTTYPE_END );");
-      output.println("#endif");
-    }
   }
  
   public void generateFlatWriteDynamicVarNode( FlatMethod fm,  
@@ -4903,53 +3063,11 @@ public class BuildCode {
                                               FlatWriteDynamicVarNode fwdvn,
                                               PrintWriter output
                                             ) {
-    if( !(state.MLP || state.OOOJAVA) ) {
+    if( !state.OOOJAVA ) {
       // should node should not be in an IR graph if the
-      // MLP flag is not set
+      // OOOJAVA flag is not set
       throw new Error("Unexpected presence of FlatWriteDynamicVarNode");
     }
-       
-    Hashtable<TempDescriptor, VSTWrapper> writeDynamic = fwdvn.getVar2src();
-
-    assert writeDynamic != null;
-
-    Iterator wdItr = writeDynamic.entrySet().iterator();
-    while( wdItr.hasNext() ) {
-      Map.Entry           me     = (Map.Entry)      wdItr.next();
-      TempDescriptor      refVar = (TempDescriptor) me.getKey();
-      VSTWrapper          vstW   = (VSTWrapper)     me.getValue();
-      VariableSourceToken vst    =                  vstW.vst;
-
-      output.println("     {");
-      output.println("       SESEcommon* oldSrc = "+refVar+"_srcSESE;");
-
-      if( vst == null ) {
-       // if there is no given source, this variable is ready so
-       // mark src pointer NULL to signify that the var is up-to-date
-       output.println("       "+refVar+"_srcSESE = NULL;");
-      } else {
-        // otherwise we track where it will come from
-        SESEandAgePair instance = new SESEandAgePair( vst.getSESE(), vst.getAge() );
-        output.println("       "+refVar+"_srcSESE = "+instance+";");    
-        output.println("       "+refVar+"_srcOffset = (INTPTR) &((("+
-                       vst.getSESE().getSESErecordName()+"*)0)->"+vst.getAddrVar()+");");
-      }
-
-      // no matter what we did above, track reference count of whatever
-      // this variable pointed to, do release last in case we're just
-      // copying the same value in because 1->2->1 is safe but ref count
-      // 1->0->1 has a window where it looks like it should be free'd
-      output.println("#ifndef OOO_DISABLE_TASKMEMPOOL" );
-      output.println("       if( "+refVar+"_srcSESE != NULL ) {");
-      output.println("         ADD_REFERENCE_TO( "+refVar+"_srcSESE );");
-      output.println("       }");
-      output.println("       if( oldSrc != NULL ) {");
-      output.println("         RELEASE_REFERENCE_TO( oldSrc );");
-      output.println("       }");
-      output.println("#endif // OOO_DISABLE_TASKMEMPOOL" );
-
-      output.println("     }");
-    }  
   }
 
   
@@ -5003,9 +3121,6 @@ public class BuildCode {
           // its static blocks have been executed
           output.println("#ifdef MGC_STATIC_INIT_CHECK");
           output.println("if(global_defs_p->" + cn.getSafeSymbol()+"static_block_exe_flag == 0) {");
-          if(cn.getNumStaticFields() != 0) {
-            // TODO add static field initialization here
-          }
           if(cn.getNumStaticBlocks() != 0) {
             MethodDescriptor t_md = (MethodDescriptor)cn.getMethodTable().get("staticblocks");
             output.println("  "+cn.getSafeSymbol()+t_md.getSafeSymbol()+"_"+t_md.getSafeMethodDescriptor()+"();");
@@ -5017,6 +3132,13 @@ public class BuildCode {
         }
       }
     }
+    if((md.getSymbol().equals("MonitorEnter") || md.getSymbol().equals("MonitorExit")) && fc.getThis().getSymbol().equals("classobj")) {
+      // call MonitorEnter/MonitorExit on a class obj
+      output.println("       " + cn.getSafeSymbol()+md.getSafeSymbol()+"_"
+          +md.getSafeMethodDescriptor() + "((struct ___Object___*)(&global_defs_p->" 
+          + fc.getThis().getType().getClassDesc().getSafeSymbol() +"classobj));");
+      return;
+    }
     }
     
     output.println("{");
@@ -5071,7 +3193,9 @@ public class BuildCode {
     } else {
       //yes
       output.print("((");
-      if (md.getReturnType().isClass()||md.getReturnType().isArray())
+      if (state.MGC && md.getReturnType().isClass() && md.getReturnType().getClassDesc().isEnum()) {
+        output.print("int ");
+      } else if (md.getReturnType().isClass()||md.getReturnType().isArray())
        output.print("struct " + md.getReturnType().getSafeSymbol()+" * ");
       else
        output.print(md.getReturnType().getSafeSymbol()+" ");
@@ -5092,7 +3216,9 @@ public class BuildCode {
        if (printcomma)
          output.print(", ");
        printcomma=true;
-       if (temp.getType().isClass()||temp.getType().isArray())
+    if (state.MGC && temp.getType().isClass() && temp.getType().getClassDesc().isEnum()) {
+      output.print("int ");
+    } else if (temp.getType().isClass()||temp.getType().isArray())
          output.print("struct " + temp.getType().getSafeSymbol()+" * ");
        else
          output.print(temp.getType().getSafeSymbol());
@@ -5123,7 +3249,9 @@ public class BuildCode {
     }
        if (needcomma)
          output.print(",");
-       if (ptd.isClass()&&!ptd.isArray())
+    if(state.MGC && ptd.isClass() && ptd.getClassDesc().isEnum()) {
+      // do nothing 
+    } else if (ptd.isClass()&&!ptd.isArray())
          output.print("(struct "+ptd.getSafeSymbol()+" *) ");
        output.print(generateTemp(fm,fc.getThis(),lb));
        needcomma=true;
@@ -5139,7 +3267,9 @@ public class BuildCode {
          output.print(", ");
 
        TypeDescriptor ptd=md.getParamType(i);
-       if (ptd.isClass()&&!ptd.isArray())
+    if (state.MGC && ptd.isClass() && ptd.getClassDesc().isEnum()) {
+      // do nothing
+    } else if (ptd.isClass()&&!ptd.isArray())
          output.print("(struct "+ptd.getSafeSymbol()+" *) ");
        output.print(generateTemp(fm, targ,lb));
        needcomma=true;
@@ -5258,9 +3388,6 @@ public class BuildCode {
               // its static blocks have been executed
               output.println("#ifdef MGC_STATIC_INIT_CHECK");
               output.println("if(global_defs_p->" + cn.getSafeSymbol()+"static_block_exe_flag == 0) {");
-              if(cn.getNumStaticFields() != 0) {
-                // TODO add static field initialization here
-              }
               if(cn.getNumStaticBlocks() != 0) {
                 MethodDescriptor t_md = (MethodDescriptor)cn.getMethodTable().get("staticblocks");
                 output.println("  "+cn.getSafeSymbol()+t_md.getSafeSymbol()+"_"+t_md.getSafeMethodDescriptor()+"();");
@@ -5273,14 +3400,20 @@ public class BuildCode {
           }
         }
         // redirect to the global_defs_p structure
-        if(ffn.getSrc().getType().isStatic()) {
+        if((ffn.getField().isStatic()) || (ffn.getSrc().getType().isClassNameRef())) {
+          // decide the exact class/interface that defines the field
+          ClassDescriptor fdcn = 
+            cd2fieldstbl.get(ffn.getSrc().getType().getClassDesc()).get(ffn.getField().getSymbol());
+
           // reference to the static field with Class name
-          output.println(generateTemp(fm, ffn.getDst(),lb)+"=global_defs_p->"+ ffn.getSrc().getType().getClassDesc().getSafeSymbol()+ffn.getField().getSafeSymbol()+";");
+          output.println(generateTemp(fm, ffn.getDst(),lb)+"=global_defs_p->"+ fdcn.getSafeSymbol()+ffn.getField().getSafeSymbol()+";");
         } else {
           output.println(generateTemp(fm, ffn.getDst(),lb)+"=*"+ generateTemp(fm,ffn.getSrc(),lb)+"->"+ ffn.getField().getSafeSymbol()+";");
         }
-        //output.println(generateTemp(fm, ffn.getDst(),lb)+"=global_defs_p->"+ffn.getSrc().getType().getClassDesc().getSafeSymbol()+"->"+ ffn.getField().getSafeSymbol()+";");
-      } else {
+      } else if (ffn.getField().isEnum()) {
+          // an Enum value, directly replace the field access as int
+          output.println(generateTemp(fm, ffn.getDst(), lb) + "=" + ffn.getField().enumValue() + ";");
+         } else {
         output.println(generateTemp(fm, ffn.getDst(),lb)+"="+ generateTemp(fm,ffn.getSrc(),lb)+"->"+ ffn.getField().getSafeSymbol()+";");
       } 
     } else {
@@ -5419,9 +3552,13 @@ public class BuildCode {
           }
         }
         // redirect to the global_defs_p structure
-        if(fsfn.getDst().getType().isStatic()) {
+        if(fsfn.getDst().getType().isClassNameRef()) {
           // reference to the static field with Class name
-          output.println("global_defs_p->" + fsfn.getDst().getType().getClassDesc().getSafeSymbol() + fsfn.getField().getSafeSymbol()+"="+ generateTemp(fm,fsfn.getSrc(),lb)+";");
+          // decide the exact class/interface that defines the field
+          ClassDescriptor fdcn = 
+            cd2fieldstbl.get(fsfn.getDst().getType().getClassDesc()).get(fsfn.getField().getSymbol());
+          
+          output.println("global_defs_p->" + fdcn.getSafeSymbol() + fsfn.getField().getSafeSymbol()+"="+ generateTemp(fm,fsfn.getSrc(),lb)+";");
         } else {
           output.println("*"+generateTemp(fm, fsfn.getDst(),lb)+"->"+ fsfn.getField().getSafeSymbol()+"="+ generateTemp(fm,fsfn.getSrc(),lb)+";");
         }
@@ -5438,7 +3575,9 @@ public class BuildCode {
     TypeDescriptor elementtype=fen.getSrc().getType().dereference();
     String type="";
 
-    if (elementtype.isArray()||elementtype.isClass())
+    if (state.MGC && elementtype.isClass() && elementtype.getClassDesc().isEnum()) {
+      type="int ";
+    } else if (elementtype.isArray()||elementtype.isClass())
       type="void *";
     else
       type=elementtype.getSafeSymbol()+" ";
@@ -5503,7 +3642,9 @@ public class BuildCode {
     TypeDescriptor elementtype=fsen.getDst().getType().dereference();
     String type="";
 
-    if (elementtype.isArray()||elementtype.isClass())
+    if (state.MGC && elementtype.isClass() && elementtype.getClassDesc().isEnum()) {
+      type="int ";
+    } else if (elementtype.isArray()||elementtype.isClass() || (state.MGC && elementtype.isNull()))
       type="void *";
     else
       type=elementtype.getSafeSymbol()+" ";
@@ -5599,6 +3740,7 @@ public class BuildCode {
     }
   }
 
+
   protected void generateFlatNew(FlatMethod fm, LocalityBinding lb, FlatNew fn, PrintWriter output) {
     if (state.DSM && locality.getAtomic(lb).get(fn).intValue()>0&&!fn.isGlobal()) {
       //Stash pointer in case of GC
@@ -5629,12 +3771,7 @@ public class BuildCode {
       if (fn.isGlobal()&&(state.DSM||state.SINGLETM)) {
        output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_newarrayglobal("+arrayid+", "+generateTemp(fm, fn.getSize(),lb)+");");
       } else if ((GENERATEPRECISEGC) || (this.state.MULTICOREGC)) {
-         if(this.state.MLP || state.OOOJAVA){
-            output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_newarray_mlp("+localsprefixaddr+", "+arrayid+", "+generateTemp(fm, fn.getSize(),lb)+", oid, "+oooa.getDisjointAnalysis().getAllocationSiteFromFlatNew(fn).getUniqueAllocSiteID()+");");
-       output.println("    oid += oidIncrement;");
-         }else{
-    output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_newarray("+localsprefixaddr+", "+arrayid+", "+generateTemp(fm, fn.getSize(),lb)+");");                     
-         }
+        output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_newarray("+localsprefixaddr+", "+arrayid+", "+generateTemp(fm, fn.getSize(),lb)+");");                 
       } else {
        output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_newarray("+arrayid+", "+generateTemp(fm, fn.getSize(),lb)+");");
       }
@@ -5642,12 +3779,7 @@ public class BuildCode {
       if (fn.isGlobal()&&(state.DSM||state.SINGLETM)) {
        output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_newglobal("+fn.getType().getClassDesc().getId()+");");
       } else if ((GENERATEPRECISEGC) || (this.state.MULTICOREGC)) {
-         if (this.state.MLP || state.OOOJAVA){
-       output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_new_mlp("+localsprefixaddr+", "+fn.getType().getClassDesc().getId()+", oid, "+oooa.getDisjointAnalysis().getAllocationSiteFromFlatNew(fn).getUniqueAllocSiteID()+");");
-       output.println("    oid += oidIncrement;");
-         } else {
-    output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_new("+localsprefixaddr+", "+fn.getType().getClassDesc().getId()+");");                     
-         }
+        output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_new("+localsprefixaddr+", "+fn.getType().getClassDesc().getId()+");");        
       } else {
        output.println(generateTemp(fm,fn.getDst(),lb)+"=allocate_new("+fn.getType().getClassDesc().getId()+");");
       }
@@ -5720,6 +3852,8 @@ public class BuildCode {
     /* TODO: Do type check here */
     if (fcn.getType().isArray()) {
       output.println(generateTemp(fm,fcn.getDst(),lb)+"=(struct ArrayObject *)"+generateTemp(fm,fcn.getSrc(),lb)+";");
+    } else if (state.MGC && fcn.getType().isClass() && fcn.getType().getClassDesc().isEnum()) {
+      output.println(generateTemp(fm,fcn.getDst(),lb)+"=(int)"+generateTemp(fm,fcn.getSrc(),lb)+";");
     } else if (fcn.getType().isClass())
       output.println(generateTemp(fm,fcn.getDst(),lb)+"=(struct "+fcn.getType().getSafeSymbol()+" *)"+generateTemp(fm,fcn.getSrc(),lb)+";");
     else
@@ -5818,7 +3952,9 @@ public class BuildCode {
     ClassDescriptor cn=md!=null ? md.getClassDesc() : null;
 
     if (md!=null&&md.getReturnType()!=null) {
-      if (md.getReturnType().isClass()||md.getReturnType().isArray())
+      if (state.MGC && md.getReturnType().isClass() && md.getReturnType().getClassDesc().isEnum()) {
+        output.print("int ");
+      } else if (md.getReturnType().isClass()||md.getReturnType().isArray())
        output.print("struct " + md.getReturnType().getSafeSymbol()+" * ");
       else
        output.print(md.getReturnType().getSafeSymbol()+" ");
@@ -5852,7 +3988,9 @@ public class BuildCode {
        if (printcomma)
          output.print(", ");
        printcomma=true;
-       if (temp.getType().isClass()||temp.getType().isArray())
+    if(state.MGC && temp.getType().isClass() && temp.getType().getClassDesc().isEnum()) {
+      output.print("int " + temp.getSafeSymbol());
+    } else if (temp.getType().isClass()||temp.getType().isArray())
          output.print("struct "+temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol());
        else
          output.print(temp.getType().getSafeSymbol()+" "+temp.getSafeSymbol());
@@ -5864,7 +4002,11 @@ public class BuildCode {
       /* Unpack variables */
       for(int i=0; i<objectparams.numPrimitives(); i++) {
        TempDescriptor temp=objectparams.getPrimitive(i);
-       output.println("struct "+temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol()+"=parameterarray["+i+"];");
+    if(state.MGC && temp.getType().isClass() && temp.getType().getClassDesc().isEnum()) {
+      output.print("int " + temp.getSafeSymbol() + "=parameterarray["+i+"];");
+    } else {
+      output.println("struct "+temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol()+"=parameterarray["+i+"];");
+    }
       }
       for(int i=0; i<fm.numTags(); i++) {
        TempDescriptor temp=fm.getTag(i);
@@ -6402,72 +4544,26 @@ public class BuildCode {
 
   protected void outputTransCode(PrintWriter output) {
   }
-  
-  private int calculateSizeOfSESEParamList(FlatSESEEnterNode fsen){
-         
-         Set<TempDescriptor> tdSet=new HashSet<TempDescriptor>();
-         
-         for (Iterator iterator = fsen.getInVarSet().iterator(); iterator.hasNext();) {
-               TempDescriptor tempDescriptor = (TempDescriptor) iterator.next();
-               if(!tempDescriptor.getType().isPrimitive() || tempDescriptor.getType().isArray()){
-                       tdSet.add(tempDescriptor);
-               }       
-         }
-         
-         for (Iterator iterator = fsen.getOutVarSet().iterator(); iterator.hasNext();) {
-                       TempDescriptor tempDescriptor = (TempDescriptor) iterator.next();
-                       if(!tempDescriptor.getType().isPrimitive() || tempDescriptor.getType().isArray()){
-                               tdSet.add(tempDescriptor);
-                       }       
-         }       
-                 
-         return tdSet.size();
-  }
-  
-  private String calculateSizeOfSESEParamSize(FlatSESEEnterNode fsen){
-    HashMap <String,Integer> map=new HashMap();
-    HashSet <TempDescriptor> processed=new HashSet<TempDescriptor>();
-    String rtr="";
-         
-    // space for all in and out set primitives
-    Set<TempDescriptor> inSetAndOutSet = new HashSet<TempDescriptor>();
-    inSetAndOutSet.addAll( fsen.getInVarSet() );
-    inSetAndOutSet.addAll( fsen.getOutVarSet() );
-           
-    Set<TempDescriptor> inSetAndOutSetPrims = new HashSet<TempDescriptor>();
-
-    Iterator<TempDescriptor> itr = inSetAndOutSet.iterator();
-    while( itr.hasNext() ) {
-      TempDescriptor temp = itr.next();
-      TypeDescriptor type = temp.getType();
-      if( !type.isPtr() ) {
-        inSetAndOutSetPrims.add( temp );
-      }
-    }
-           
-    Iterator<TempDescriptor> itrPrims = inSetAndOutSetPrims.iterator();
-    while( itrPrims.hasNext() ) {
-      TempDescriptor temp = itrPrims.next();
-      TypeDescriptor type = temp.getType();
-      if(type.isPrimitive()){
-        Integer count=map.get(type.getSymbol());
-        if(count==null){
-          count=new Integer(1);
-          map.put(type.getSymbol(), count);
-        }else{
-          map.put(type.getSymbol(), new Integer(count.intValue()+1));
-        }
-      }      
-    }
-         
-    Set<String> keySet=map.keySet();
-    for (Iterator iterator = keySet.iterator(); iterator.hasNext();) {
-      String key = (String) iterator.next();
-      rtr+="+sizeof("+key+")*"+map.get(key);
-    }
-    return  rtr;
-  }
 
+
+
+  // override these methods in a subclass of BuildCode
+  // to generate code for additional systems
+  protected void additionalIncludesMethodsHeader( PrintWriter outmethodheader ) {}
+  protected void preCodeGenInitialization() {}
+  protected void postCodeGenCleanUp() {}
+  protected void additionalCodeGen( PrintWriter outmethodheader,
+                                    PrintWriter outstructs,
+                                    PrintWriter outmethod ) {}
+  protected void additionalCodeAtTopOfMain( PrintWriter outmethod ) {}
+  protected void additionalCodeAtBottomOfMain( PrintWriter outmethod ) {}
+  protected void additionalIncludesMethodsImplementation( PrintWriter outmethod ) {}
+  protected void additionalIncludesStructsHeader( PrintWriter outstructs ) {}
+  protected void additionalClassObjectFields( PrintWriter outclassdefs ) {}
+  protected void additionalCodeAtTopMethodsImplementation( PrintWriter outmethod ) {}
+  protected void additionalCodeAtTopFlatMethodBody( PrintWriter output, FlatMethod fm ) {}
+  protected void additionalCodePreNode( FlatMethod fm, LocalityBinding lb, FlatNode fn, PrintWriter output ) {}
+  protected void additionalCodePostNode( FlatMethod fm, LocalityBinding lb, FlatNode fn, PrintWriter output ) {}
 }