*** empty log message ***

diff --git a/Repair/RepairCompiler/MCC/IR/ArrayAnalysis.java b/Repair/RepairCompiler/MCC/IR/ArrayAnalysis.java
index ca142f7be6b498a9204008822c062c8e10f03587..dc5f289b313b6f47b4cd30f4a8dad9c422744be1 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/ArrayAnalysis.java
+++ b/Repair/RepairCompiler/MCC/IR/ArrayAnalysis.java
@@ -156,6 +156,18 @@ public class ArrayAnalysis {
        SetDescriptor startset;
        VarDescriptor startvar;
 
        SetDescriptor startset;
        VarDescriptor startvar;
 

+       public boolean isSet() {
+           return setStart;
+       }
+
+       public SetDescriptor getSet() {
+           return startset;
+       }
+
+       public VarDescriptor getVar() {
+           return startvar;
+       }
+

 
        public void startSet(SetDescriptor sd) {
            this.startset=sd;
 
        public void startSet(SetDescriptor sd) {
            this.startset=sd;

diff --git a/Repair/RepairCompiler/MCC/IR/Termination.java b/Repair/RepairCompiler/MCC/IR/Termination.java
index 465675c01f9fd1289ceb7bab6f545834a1abc254..2687f51711fccbd80b51fd6b5f06f9f8ef515afa 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/Termination.java
+++ b/Repair/RepairCompiler/MCC/IR/Termination.java
@@ -885,7 +885,7 @@ public class Termination {
                    System.out.println("ERROR:Index is assignable");
                    return false;
                }
                    System.out.println("ERROR:Index is assignable");
                    return false;
                }

-               Updates updates=new Updates(index,i,ap,slotnumber);
+               Updates updates=new Updates(index,i,ap,lexpr,slotnumber);

                un.addUpdate(updates);
            }
        }
                un.addUpdate(updates);
            }
        }

diff --git a/Repair/RepairCompiler/MCC/IR/UpdateNode.java b/Repair/RepairCompiler/MCC/IR/UpdateNode.java
index 7c0e5a464ab3129dc016f70f3cb52627b6471fd2..d4583822aeb15a2bbd4872a639599c82db9b61ea 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/UpdateNode.java
+++ b/Repair/RepairCompiler/MCC/IR/UpdateNode.java
@@ -356,6 +356,7 @@ class UpdateNode {
            if (u.getType()==Updates.ACCESSPATH) {
                VarDescriptor newright=VarDescriptor.makeNew("right");
                /* Need to do the modulo computation here...FIXME */
            if (u.getType()==Updates.ACCESSPATH) {
                VarDescriptor newright=VarDescriptor.makeNew("right");
                /* Need to do the modulo computation here...FIXME */

+               generate_accesspath(cr, right,newright,u);

                right=newright;
            }
            VarDescriptor left=VarDescriptor.makeNew("left");
                right=newright;
            }
            VarDescriptor left=VarDescriptor.makeNew("left");


@@ -432,6 +433,38 @@ class UpdateNode {
        }
     }
 
        }
     }
 

+
+    private void generate_accesspath(CodeWriter cr, VarDescriptor right, VarDescriptor newright, Updates u) {
+       Vector dotvector=new Vector();
+       Expr ptr=u.getRightExpr();
+
+       while(true) {
+           /* Does something other than a dereference? */
+           dotvector.add(ptr);
+           if (ptr instanceof DotExpr)
+               ptr=((DotExpr)ptr).left;
+           else if (ptr instanceof CastExpr)
+               ptr=((CastExpr)ptr).getExpr();
+
+           if (ptr instanceof VarExpr) {
+               /* Finished constructing vector */
+               break;
+           }
+       }
+       ArrayAnalysis.AccessPath ap=u.getAccessPath();
+       VarDescriptor init=VarDescriptor.makeNew("init");
+       if (ap.isSet()) {
+           cr.outputline("int "+init.getSafeSymbol()+"="+ap.getSet().getSafeSymbol()+"_hash->firstkey();")
+       } else {
+           init=ap.getVar();
+       }
+       for(int i=dotvector.size()-1;i>=0;i--) {
+           Expr e=(Expr)dotvector.get(i);
+           
+       }
+       
+    }
+

     private void generate_bindings(CodeWriter cr, String slot0, String slot1) {
        for(int i=0;i<bindings.size();i++) {
            Binding b=(Binding)bindings.get(i);
     private void generate_bindings(CodeWriter cr, String slot0, String slot1) {
        for(int i=0;i<bindings.size();i++) {
            Binding b=(Binding)bindings.get(i);

diff --git a/Repair/RepairCompiler/MCC/IR/Updates.java b/Repair/RepairCompiler/MCC/IR/Updates.java
index 99694cd3cb208e8eeac9f4c7c4092750e4ff3cae..acda79f5da9f4c75cfe0a26ceae725a1f5b372e0 100755 (executable)
--- a/Repair/RepairCompiler/MCC/IR/Updates.java
+++ b/Repair/RepairCompiler/MCC/IR/Updates.java
@@ -15,12 +15,12 @@ class Updates {
     ArrayAnalysis.AccessPath ap;
     int fieldnum;
 
     ArrayAnalysis.AccessPath ap;
     int fieldnum;
 

-    public Updates(Expr lexpr, int fieldnum, ArrayAnalysis.AccessPath ap, int slot) {
+    public Updates(Expr lexpr, int fieldnum, ArrayAnalysis.AccessPath ap, Expr rexpr, int slot) {

        this.leftexpr=lexpr;
        this.fieldnum=fieldnum;
        this.ap=ap;
        this.rightposition=slot;
        this.leftexpr=lexpr;
        this.fieldnum=fieldnum;
        this.ap=ap;
        this.rightposition=slot;

-
+       this.rightexpr=rexpr;

        this.type=Updates.ACCESSPATH;
        this.opcode=Opcode.EQ;
     }
        this.type=Updates.ACCESSPATH;
        this.opcode=Opcode.EQ;
     }