From 5efab36c54ee5cf97cdf12f033e29ffad1b2bc3a Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Thu, 29 Jul 2004 05:51:02 +0000
Subject: [PATCH] Updating size computation class.`
---
Repair/RepairCompiler/MCC/IR/ExactSize.java | 85 +++++++++++++++++++-
Repair/RepairCompiler/MCC/IR/SizeObject.java | 1 +
2 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/Repair/RepairCompiler/MCC/IR/ExactSize.java b/Repair/RepairCompiler/MCC/IR/ExactSize.java
index 0588c0f..b5b9851 100755
--- a/Repair/RepairCompiler/MCC/IR/ExactSize.java
+++ b/Repair/RepairCompiler/MCC/IR/ExactSize.java
@@ -7,11 +7,13 @@ class ExactSize {
State state;
private Hashtable sizemap;
private Hashtable constraintmap;
+ private SetAnalysis setanalysis;
public ExactSize(State state) {
this.state=state;
this.sizemap=new Hashtable();
this.constraintmap=new Hashtable();
+ this.setanalysis=new SetAnalysis(state);
computesizes();
}
@@ -27,6 +29,32 @@ class ExactSize {
return (Constraint)constraintmap.get(so);
}
+ public int getsize(RelationDescriptor rd, SetDescriptor sd, boolean inverted) {
+ Iterator it=setanalysis.getSuperset(sd).iterator();
+ while(sd!=null) {
+ SizeObject so=new SizeObject(rd,sd,inverted);
+ if (sizemap.containsKey(so))
+ return ((Integer)sizemap.get(so)).intValue();
+ sd=null;
+ if (it.hasNext())
+ sd=(SetDescriptor)it.next();
+ }
+ return -1;
+ }
+
+ public Constraint getConstraint(RelationDescriptor rd, SetDescriptor sd, boolean inverted) {
+ Iterator it=setanalysis.getSuperset(sd).iterator();
+ while(sd!=null) {
+ SizeObject so=new SizeObject(rd,sd,inverted);
+ if (constraintmap.containsKey(so))
+ return ((Constraint)constraintmap.get(so));
+ sd=null;
+ if (it.hasNext())
+ sd=(SetDescriptor)it.next();
+ }
+ return null;
+ }
+
private void computesizes() {
for(Iterator it=state.stSets.descriptors();it.hasNext();) {
SetDescriptor sd=(SetDescriptor)it.next();
@@ -60,7 +88,7 @@ class ExactSize {
break;
}
}
- }
+ }
}
}
}
@@ -77,5 +105,60 @@ class ExactSize {
}
}
}
+
+ for(Iterator it=state.stRelations.descriptors();it.hasNext();) {
+ RelationDescriptor rd=(RelationDescriptor)it.next();
+ for(int i=0;i<state.vConstraints.size();i++) {
+ Constraint c=(Constraint)state.vConstraints.get(i);
+ if (c.numQuantifiers()!=1||!(c.getQuantifier(0) instanceof SetQuantifier))
+ continue;
+ SetQuantifier q=(SetQuantifier) c.getQuantifier(0);
+
+ DNFConstraint dconst=c.dnfconstraint;
+ int oldsize=-1;
+ boolean matches=true;
+ boolean inverted=false;
+ for(int j=0;j<dconst.size();j++) {
+ Conjunction conj=dconst.get(j);
+ boolean goodmatch=false;
+ for(int k=0;k<conj.size();k++) {
+ DNFPredicate dpred=conj.get(k);
+ if (!dpred.isNegated()) {
+ Predicate p=dpred.getPredicate();
+ if (p instanceof ExprPredicate) {
+ ExprPredicate ep=(ExprPredicate)p;
+ if (ep.getType()==ExprPredicate.SIZE&&
+ ep.getOp()==Opcode.EQ&&
+ ep.getDescriptor()==rd&&
+ ep.isRightInt()&&
+ ((ImageSetExpr)((SizeofExpr)((OpExpr)ep.expr).left).getSetExpr()).getVar()==q.getVar()) {
+ if (j==0) {
+ oldsize=ep.rightSize();
+ goodmatch=true;
+ inverted=ep.inverted();
+ break;
+ } else {
+ if (oldsize==ep.rightSize()&&inverted==ep.inverted()) {
+ goodmatch=true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ if (!goodmatch) {
+ matches=false;
+ break; //this constraint won't work
+ }
+ }
+ if (matches) {
+ System.out.println("Set "+rd.toString()+" has size "+oldsize);
+ SizeObject so=new SizeObject(rd,q.getSet(),inverted);
+ sizemap.put(so,new Integer(oldsize));
+ constraintmap.put(so,c);
+ }
+ }
+ }
}
}
diff --git a/Repair/RepairCompiler/MCC/IR/SizeObject.java b/Repair/RepairCompiler/MCC/IR/SizeObject.java
index 0bd7b8d..b19df72 100755
--- a/Repair/RepairCompiler/MCC/IR/SizeObject.java
+++ b/Repair/RepairCompiler/MCC/IR/SizeObject.java
@@ -24,6 +24,7 @@ class SizeObject {
hashcode^=set.hashCode();
return hashcode;
}
+
public boolean equals(java.lang.Object o) {
if (!(o instanceof SizeObject))
return false;
--
2.34.1