From: jjenista <jjenista>
Date: Thu, 14 May 2009 22:34:21 +0000 (+0000)
Subject: use sese pretty id and id to generate method names, param struct and local struct... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1182a29c6c7b4dafe907ad1db57647092b2a037b;p=IRC.git

use sese pretty id and id to generate method names, param struct and local struct that is unique--keep a mapping of seses to the bogus flat method for retrieval in order to reproduce those names at call sites.  Also some bug fixes
---

diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java
index 0d1cbb67..1aa82557 100644
--- a/Robust/src/IR/Flat/BuildCode.java
+++ b/Robust/src/IR/Flat/BuildCode.java
@@ -1,4 +1,5 @@
 package IR.Flat;
+import IR.Tree.Modifiers;
 import IR.Tree.FlagExpressionNode;
 import IR.Tree.DNFFlag;
 import IR.Tree.DNFFlagAtom;
@@ -54,6 +55,7 @@ public class BuildCode {
   SafetyAnalysis sa;
   PrefetchAnalysis pa;
   MLPAnalysis mlpa;
+  Hashtable<FlatSESEEnterNode, FlatMethod> sese2bogusFlatMeth;
   boolean nonSESEpass=true;
   WriteBarrier wb;
   DiscoverConflicts dc;
@@ -97,6 +99,9 @@ public class BuildCode {
       this.dc=new DiscoverConflicts(locality, st, typeanalysis);
       dc.doAnalysis();
     }
+    if(state.MLP) {
+      sese2bogusFlatMeth = new Hashtable<FlatSESEEnterNode, FlatMethod>();
+    }
   }
 
   /** The buildCode method outputs C code for all the methods.  The Flat
@@ -1554,17 +1559,21 @@ public class BuildCode {
                                     PrintWriter outputMethods
                                     ) {
 
-    /*
+
     FlatMethod       fm = fsen.getEnclosingFlatMeth();
     MethodDescriptor md = fm.getMethod();
     ClassDescriptor  cn = md.getClassDesc();
     
-    
+        
     //Creates bogus method descriptor to index into tables
     Modifiers bogusmod=new Modifiers();
-    MethodDescriptor bogusmd=new MethodDescriptor(bogusmod, new TypeDescriptor(TypeDescriptor.VOID), fsen.getIdentifier());
+    MethodDescriptor bogusmd=new MethodDescriptor(bogusmod, 
+                                                  new TypeDescriptor(TypeDescriptor.VOID), 
+                                                  fsen.getPrettyIdentifier()+fsen.getIdentifier());
     FlatMethod bogusfm=new FlatMethod(bogusmd, null);
-    
+    sese2bogusFlatMeth.put(fsen, bogusfm);
+
+
     //Build paramsobj for bogus method descriptor
     ParamsObject objectparams=new ParamsObject(bogusmd, tag++);
     paramstable.put(bogusmd, objectparams);
@@ -1572,14 +1581,15 @@ public class BuildCode {
     for(int i=0; i<fsen.numParameters(); i++) {
       TempDescriptor temp=fsen.getParameter(i);
       TypeDescriptor type=temp.getType();
-      if (type.isPtr()&&GENERATEPRECISEGC)
+      if (type.isPtr()&&GENERATEPRECISEGC) {
 	objectparams.addPtr(temp);
-      else
+      } else {
 	objectparams.addPrim(temp);
+      }
     }
     
-    //Build normal temp object for bogus method descriptor
     
+    //Build normal temp object for bogus method descriptor
     TempObject objecttemps=new TempObject(objectparams,bogusmd,tag++);
     tempstable.put(bogusmd, objecttemps);
     
@@ -1596,8 +1606,8 @@ public class BuildCode {
       }
     }
     
+    
     //Generate code for parameters structure
-
     generateMethodParam(cn, bogusmd, null, outputStructs); 
 
     //Generate code for locals structure
@@ -1613,32 +1623,31 @@ public class BuildCode {
     }
     outputStructs.println("};\n");
     
-    //Ready to build code at this point
-
-    headersout.print("void ");
-
-    // Next the method name
-    headersout.print(cn.getSafeSymbol()+bogusmd.getSafeSymbol()+"_"+bogusmd.getSafeMethodDescriptor()+"(");
 
+    // write method declaration to header file
+    outputMethHead.print("void ");
+    outputMethHead.print(cn.getSafeSymbol()+bogusmd.getSafeSymbol()+"_"+bogusmd.getSafeMethodDescriptor()+"(");
     boolean printcomma=false;
     if (GENERATEPRECISEGC) {
-      headersout.print("struct "+cn.getSafeSymbol()+bogusmd.getSafeSymbol()+"_"+bogusmd.getSafeMethodDescriptor()+"_params * "+paramsprefix);
+      outputMethHead.print("struct "+cn.getSafeSymbol()+
+                           bogusmd.getSafeSymbol()+"_"+
+                           bogusmd.getSafeMethodDescriptor()+"_params * "+paramsprefix);
       printcomma=true;
     }
-
     //  Output parameter list
     for(int i=0; i<objectparams.numPrimitives(); i++) {
       TempDescriptor temp=objectparams.getPrimitive(i);
       if (printcomma)
-	headersout.print(", ");
+	outputMethHead.print(", ");
       printcomma=true;
       if (temp.getType().isClass()||temp.getType().isArray())
-	headersout.print("struct " + temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol());
+	outputMethHead.print("struct " + temp.getType().getSafeSymbol()+" * "+temp.getSafeSymbol());
       else
-	headersout.print(temp.getType().getSafeSymbol()+" "+temp.getSafeSymbol());
+	outputMethHead.print(temp.getType().getSafeSymbol()+" "+temp.getSafeSymbol());
     }
-    headersout.println(");\n");
+    outputMethHead.println(");\n");
 
+    /*
     generateFlatMethodSESE(bogusfm, cn, fsen, fsen.getFlatExit(), output?????????);
     */
   }