crhead.outputline("~"+name+"();");
craux.outputline("#include \""+headername+"\"");
craux.outputline("#include \"size.h\"");
-
+ if (Compiler.TIME) {
+ craux.outputline("#include <sys/time.h>");
+ }
+ if (Compiler.ALLOCATECPLUSPLUS) {
+ for(Iterator it=state.stTypes.descriptors();it.hasNext();) {
+ TypeDescriptor td=(TypeDescriptor)it.next();
+ if (td instanceof StructureTypeDescriptor) {
+ if (((StructureTypeDescriptor)td).size()>0) {
+ FieldDescriptor fd=((StructureTypeDescriptor)td).get(0);
+ if (fd.getSymbol().startsWith("_vptr_")) {
+ String vtable="_ZTV";
+ vtable+=td.getSymbol().length();
+ vtable+=td.getSymbol();
+ craux.outputline("extern void * "+vtable+";");
+ }
+ }
+ }
+ }
+ }
craux.outputline(name+"::"+name+"() {");
craux.outputline("// creating hashtables ");
crhead.outputline("void doanalysis();");
craux.outputline("void "+name +"_state::doanalysis()");
craux.startblock();
+ if (Compiler.TIME) {
+ craux.outputline("struct timeval _begin_time,_end_time;");
+ craux.outputline("gettimeofday(&_begin_time,NULL);");
+ }
+
if (Compiler.GENERATEINSTRUMENT) {
craux.outputline("updatecount=0;");
craux.outputline("rebuildcount=0;");
private void generate_teardown() {
CodeWriter cr = new StandardCodeWriter(outputaux);
cr.endblock();
+ if (Compiler.TIME) {
+ cr.outputline("gettimeofday(&_end_time,NULL);");
+ cr.outputline("printf(\"time=%ld uS\\n\",(_end_time.tv_sec-_begin_time.tv_sec)*1000000+_end_time.tv_usec-_begin_time.tv_usec);");
+ }
+
if (Compiler.GENERATEINSTRUMENT) {
cr.outputline("printf(\"updatecount=%d\\n\",updatecount);");
cr.outputline("printf(\"rebuildcount=%d\\n\",rebuildcount);");
cr.outputline("if (maybe)");
cr.startblock();
cr.outputline("printf(\"maybe fail " + escape(constraint.toString()) + ". \\n\");");
- cr.outputline("exit(1);");
+ //cr.outputline("exit(1);");
cr.endblock();
cr.outputline("else if (!" + constraintboolean.getSafeSymbol() + ")");
private Set getmultupdatenodeset(Conjunction conj, DNFPredicate dpred, int repairtype) {
HashSet hs=new HashSet();
- MultUpdateNode mun=null;
GraphNode gn=(GraphNode) termination.conjtonodemap.get(conj);
- for(Iterator edgeit=gn.edges();(mun==null)&&edgeit.hasNext();) {
+ for(Iterator edgeit=gn.edges();edgeit.hasNext();) {
GraphNode gn2=((GraphNode.Edge) edgeit.next()).getTarget();
TermNode tn2=(TermNode)gn2.getOwner();
if (tn2.getType()==TermNode.ABSTRACT) {
if (!removed.contains(gn3)) {
TermNode tn3=(TermNode)gn3.getOwner();
if (tn3.getType()==TermNode.UPDATE) {
- hs.add(mun);
+ hs.add(tn3.getUpdate());
}
}
}
VarDescriptor leftside=VarDescriptor.makeNew("leftside");
VarDescriptor rightside=VarDescriptor.makeNew("rightside");
VarDescriptor newvalue=VarDescriptor.makeNew("newvalue");
- if (!inverted) {
+ boolean needremoveloop=ar.mayNeedFunctionEnforcement(state)&&ar.needsRemoves(state);
+
+ if (needremoveloop&&((munadd==null)||(munremove==null))) {
+ System.out.println("Warning: need to have individual remove operations for"+dpred.name());
+ needremoveloop=false;
+ }
+ if (needremoveloop)
+ cr.outputline("while (1) {");
+
+ if (!inverted) {
((RelationExpr)expr.getLeftExpr()).getExpr().generate(cr,leftside);
expr.getRightExpr().generate(cr,newvalue);
cr.outputline(rd.getRange().getType().getGenerateType().getSafeSymbol()+" "+rightside.getSafeSymbol()+";");
cr.outputline(rd.getDomain().getType().getGenerateType().getSafeSymbol()+" "+leftside.getSafeSymbol()+";");
cr.outputline(rd.getSafeSymbol()+"_hashinv->get("+rightside.getSafeSymbol()+","+leftside.getSafeSymbol()+");");
}
- if (negated)
- if (opcode==Opcode.GT) {
- opcode=Opcode.LE;
- } else if (opcode==Opcode.GE) {
- opcode=Opcode.LT;
- } else if (opcode==Opcode.LT) {
- opcode=Opcode.GE;
- } else if (opcode==Opcode.LE) {
- opcode=Opcode.GT;
- } else if (opcode==Opcode.EQ) {
- opcode=Opcode.NE;
- } else if (opcode==Opcode.NE) {
- opcode=Opcode.EQ;
- } else {
- throw new Error("Unrecognized Opcode");
- }
+
+ opcode=Opcode.translateOpcode(negated,opcode);
if (opcode==Opcode.GT) {
cr.outputline(newvalue.getSafeSymbol()+"++;");
/* Do abstract repairs */
if (usageimage) {
cr.outputline(rd.getSafeSymbol()+"_hash->remove("+leftside.getSafeSymbol()+","+rightside.getSafeSymbol()+");");
+ }
+ if (usageinvimage) {
+ cr.outputline(rd.getSafeSymbol()+"_hashinv->remove("+rightside.getSafeSymbol()+","+leftside.getSafeSymbol()+");");
+ }
+
+ if (needremoveloop) {
+ if (!inverted) {
+ cr.outputline("if ("+rd.getSafeSymbol()+"_hash->contains("+leftside.getSafeSymbol()+")) {");
+ } else {
+ cr.outputline("if ("+rd.getSafeSymbol()+"_hashinv->contains("+rightside.getSafeSymbol()+")) {");
+ }
+ for(int i=0;i<state.vRules.size();i++) {
+ Rule r=(Rule)state.vRules.get(i);
+ if (r.getInclusion().getTargetDescriptors().contains(rd)) {
+ for(int j=0;j<munremove.numUpdates();j++) {
+ UpdateNode un=munremove.getUpdate(i);
+ if (un.getRule()==r) {
+ /* Update for rule r */
+ String name=(String)updatenames.get(un);
+ cr.outputline(repairtable.getSafeSymbol()+"->addrelation("+rd.getNum()+","+r.getNum()+","+leftside.getSafeSymbol()+","+rightside.getSafeSymbol()+",(int) &"+name+");");
+ }
+ }
+ }
+ }
+ cr.outputline("continue;");
+ cr.outputline("}");
+ }
+
+ if (usageimage) {
if (!inverted) {
cr.outputline(rd.getSafeSymbol()+"_hash->add("+leftside.getSafeSymbol()+","+newvalue.getSafeSymbol()+");");
} else {
}
}
if (usageinvimage) {
- cr.outputline(rd.getSafeSymbol()+"_hashinv->remove("+rightside.getSafeSymbol()+","+leftside.getSafeSymbol()+");");
if (!inverted) {
cr.outputline(rd.getSafeSymbol()+"_hashinv->add("+newvalue.getSafeSymbol()+","+leftside.getSafeSymbol()+");");
} else {
}
}
/* Do concrete repairs */
- if (munmodify!=null) {
+ if (munmodify!=null&&(!ar.mayNeedFunctionEnforcement(state))||(munadd==null)||(ar.needsRemoves(state)&&(munremove==null))) {
for(int i=0;i<state.vRules.size();i++) {
Rule r=(Rule)state.vRules.get(i);
if (r.getInclusion().getTargetDescriptors().contains(rd)) {
}
} else {
/* Start with scheduling removal */
-
if (ar.needsRemoves(state))
for(int i=0;i<state.vRules.size();i++) {
Rule r=(Rule)state.vRules.get(i);
cr.outputline(name+"(this,"+newmodel.getSafeSymbol()+","+repairtable.getSafeSymbol()+","+newvalue.getSafeSymbol()+","+rightside.getSafeSymbol()+");");
}
}
+ if (needremoveloop) {
+ cr.outputline("break;");
+ cr.outputline("}");
+ }
}
public void generatesizerepair(Conjunction conj, DNFPredicate dpred, CodeWriter cr) {
VarDescriptor rightvar=VarDescriptor.makeNew("rightvar");
if (d instanceof RelationDescriptor) {
if (ep.inverted()) {
- rightvar=((ImageSetExpr)((SizeofExpr)((OpExpr)expr).left).setexpr).getVar();
+ ((ImageSetExpr)((SizeofExpr)expr.left).setexpr).generate_leftside(cr,rightvar);
cr.outputline("int "+leftvar.getSafeSymbol()+";");
cr.outputline(d.getSafeSymbol()+"_hashinv->get((int)"+rightvar.getSafeSymbol()+","+leftvar.getSafeSymbol()+");");
} else {
- leftvar=((ImageSetExpr)((SizeofExpr)((OpExpr)expr).left).setexpr).getVar();
+ ((ImageSetExpr)((SizeofExpr)expr.left).setexpr).generate_leftside(cr,leftvar);
cr.outputline("int "+rightvar.getSafeSymbol()+"=0;");
cr.outputline(d.getSafeSymbol()+"_hash->get((int)"+leftvar.getSafeSymbol()+","+rightvar.getSafeSymbol()+");");
}
}
cr.endblock();
}
+
+// In some cases the analysis has determined that generating removes
+// is unnecessary
+ if (generateadd&&munadd==null)
+ generateadd=false;
+
if (generateadd) {
cr.outputline("for(;"+change.getSafeSymbol()+">0;"+change.getSafeSymbol()+"--)");
cr.startblock();
VarDescriptor newobject=VarDescriptor.makeNew("newobject");
if (d instanceof RelationDescriptor) {
- VarDescriptor otherside=((ImageSetExpr)((SizeofExpr)((OpExpr)ep.expr).left).setexpr).vd;
+ VarDescriptor otherside=VarDescriptor.makeNew("otherside");
+ ((ImageSetExpr)((SizeofExpr)expr.left).setexpr).generate_leftside(cr,otherside);
+
RelationDescriptor rd=(RelationDescriptor)d;
if (termination.sources.relsetSource(rd,!ep.inverted())) {
/* Set Source */