Modify Generators to allow multiple specs

diff --git a/Repair/RepairCompiler/MCC/IR/RepairGenerator.java b/Repair/RepairCompiler/MCC/IR/RepairGenerator.java
index 80400dc0a84e4bf56aa941dd58904ebc07b96faf..8d095b69fcea6977de12c38d02ecf4ddae8bff8e 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/RepairGenerator.java
+++ b/Repair/RepairCompiler/MCC/IR/RepairGenerator.java
@@ -568,7 +568,8 @@ public class RepairGenerator {
        craux.addDeclaration("struct RepairHash * ",repairtable.getSafeSymbol());
        craux.outputline(repairtable.getSafeSymbol()+"=0;");
        craux.outputline("initializestack(&highmark);");
-       craux.outputline("computesizes(thisvar);");
+       craux.outputline(name+"_statecomputesizes(thisvar, arsize, arnumelements);");
+       craux.outputline("computesizes();");
        craux.outputline(name+"_staterecomputesizes(thisvar);");
        craux.outputline("while (1)");
        craux.startblock();

diff --git a/Repair/RepairCompiler/MCC/IR/StructureGenerator.java b/Repair/RepairCompiler/MCC/IR/StructureGenerator.java
index b3a6664b89d26462d5d9c61d961e970f671c1270..f464977f157f27f3f4dd1892a29b75254bf97931 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/StructureGenerator.java
+++ b/Repair/RepairCompiler/MCC/IR/StructureGenerator.java
@@ -84,9 +84,10 @@ public class StructureGenerator {
 
     private void generatecomputesize() {
        int max=TypeDescriptor.counter;
-       cr.outputline("void computesizes(struct "+rg.name+"_state * obj) {");
+       cr.outputline("void computesizes() {");
         cr.outputline("int i;");
-       cr.outputline(rg.name+"_statecomputesizes(obj,arsize,arnumelements);");
+       //moved this to caller
+       //cr.outputline(rg.name+"_statecomputesizes(obj,arsize,arnumelements);");
        cr.outputline("for(i=0;i<"+max+";i++) {");
        cr.outputline("int bits=arsize[i];");
        cr.outputline("int bytes=bits>>3;");
@@ -97,6 +98,7 @@ public class StructureGenerator {
     }
 
     private void generateheader() {
+       int max=TypeDescriptor.counter;
        crhead.outputline("#include \""+rg.headername + "\"");
        crhead.outputline("int getfield(int type, int fieldindex);");
        crhead.outputline("int isArray(int type, int fieldindex);");
@@ -106,7 +108,9 @@ public class StructureGenerator {
        crhead.outputline("int sizeBytes(int type);");
        crhead.outputline("int getnumfields(int type);");
        crhead.outputline("bool issubtype(int subtype, int type);");
-       crhead.outputline("void computesizes(struct "+rg.name+"_state *);");
+       crhead.outputline("void computesizes();");
+       crhead.outputline("extern int arsize["+max+"];");
+       crhead.outputline("extern int* arnumelements["+max+"];");
     }