X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/2934b455c4074408a0f819009c071456f021ba21..6156f62a83cf02cdcb6282937f9619e7753a4534:/src/constraintResolve.c diff --git a/src/constraintResolve.c b/src/constraintResolve.c index de80027..aa6c6ba 100644 --- a/src/constraintResolve.c +++ b/src/constraintResolve.c @@ -1,39 +1,58 @@ +/* +** Splint - annotation-assisted static program checker +** Copyright (C) 1994-2003 University of Virginia, +** Massachusetts Institute of Technology +** +** This program is free software; you can redistribute it and/or modify it +** under the terms of the GNU General Public License as published by the +** Free Software Foundation; either version 2 of the License, or (at your +** option) any later version. +** +** This program is distributed in the hope that it will be useful, but +** WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. +** +** The GNU General Public License is available from http://www.gnu.org/ or +** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, +** MA 02111-1307, USA. +** +** For information on splint: info@splint.org +** To report a bug: splint-bug@splint.org +** For more information: http://www.splint.org +*/ + /* * ** constraintResolve.c */ -//#define DEBUGPRINT 1 +/* #define DEBUGPRINT 1 */ # include /* for isdigit */ -# include "lclintMacros.nf" +# include "splintMacros.nf" # include "basic.h" # include "cgrammar.h" # include "cgrammar_tokens.h" # include "exprChecks.h" -# include "aliasChecks.h" # include "exprNodeSList.h" +/*@access constraint, exprNode @*/ /*!!! NO! Don't do this so recklessly - design your code more carefully so you don't need to! */ -/*@access constraint, exprNode @*/ - -static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arithType ar2, /*@observer@*/ constraintExpr expr2); - -static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint c, constraintList p); - -static constraint constraint_searchandreplace (/*@returned@*/ constraint c, constraintExpr old, constraintExpr new); - +static constraint inequalitySubstitute (/*@returned@*/ constraint p_c, constraintList p_p); +static bool rangeCheck (arithType p_ar1, /*@observer@*/ constraintExpr p_expr1, arithType p_ar2, /*@observer@*/ constraintExpr p_expr2); -static constraint constraint_addOr (/*@returned@*/ constraint orig, /*@observer@*/ constraint or); +static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint p_c, constraintList p_p); +static constraint inequalitySubstituteStrong (/*@returned@*/ constraint p_c, constraintList p_p); -static bool resolveOr (/*@observer@*/ constraint c, /*@observer@*/ constraintList list); +static constraint constraint_searchandreplace (/*@returned@*/ constraint p_c, constraintExpr p_old, constraintExpr p_newExpr); -static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constraintList pre2, constraintList post1); - -/*********************************************/ +static constraint constraint_addOr (/*@returned@*/ constraint p_orig, /*@observer@*/ constraint p_orConstr); +static bool resolveOr (/*@temp@*/constraint p_c, /*@observer@*/ /*@temp@*/ constraintList p_list); +static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constraintList p_pre2, constraintList p_post1); /*@only@*/ constraintList constraintList_mergeEnsuresFreeFirst (constraintList list1, constraintList list2) @@ -51,13 +70,11 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai constraintList ret; constraintList temp; - //ret = constraintList_makeNew(); - llassert(constraintList_isDefined(list1) ); llassert(constraintList_isDefined(list2) ); DPRINTF(( message ("constraintList_mergeEnsures: list1 %s list2 %s", - constraintList_print(list1), constraintList_print(list2) + constraintList_unparse(list1), constraintList_unparse(list2) ))); ret = constraintList_fixConflicts (list1, list2); @@ -72,13 +89,11 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai constraintList_free(ret); DPRINTF(( message ("constraintList_mergeEnsures: returning %s ", - constraintList_print(temp) ) + constraintList_unparse(temp) ) )); return temp; - //ret = constraintList_addList (ret, list2); - //return ret; } @@ -98,110 +113,48 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai constraintList ret; constraintList temp; - DPRINTF((message ("constraintList_mergeRequires: merging %s and %s ", constraintList_print (list1), constraintList_print(list2) ) ) ); + DPRINTF((message ("constraintList_mergeRequires: merging %s and %s ", constraintList_unparse (list1), constraintList_unparse(list2) ) ) ); + if (context_getFlag (FLG_REDUNDANTCONSTRAINTS) ) + { + ret = constraintList_copy(list1); + ret = constraintList_addList(ret, list2); + return ret; + } + /* get constraints in list1 not satified by list2 */ - temp = reflectChanges (list1, list2); - DPRINTF((message ("constraintList_mergeRequires: temp = %s", constraintList_print(temp) ) ) ); + temp = constraintList_reflectChanges(list1, list2); + DPRINTF((message ("constraintList_mergeRequires: temp = %s", constraintList_unparse(temp) ) ) ); /*get constraints in list2 not satified by temp*/ - ret = reflectChanges (list2, temp); + ret = constraintList_reflectChanges(list2, temp); - DPRINTF((message ("constraintList_mergeRequires: ret = %s", constraintList_print(ret) ) ) ); + DPRINTF((message ("constraintList_mergeRequires: ret = %s", constraintList_unparse(ret) ) ) ); ret = constraintList_addListFree (ret, temp); - DPRINTF((message ("constraintList_mergeRequires: returning %s", constraintList_print(ret) ) ) ); + DPRINTF((message ("constraintList_mergeRequires: returning %s", constraintList_unparse(ret) ) ) ); return ret; } -void checkArgumentList (/*@out@*/ exprNode temp, exprNodeList arglist, fileloc sequencePoint) +/* old name mergeResolve renamed for czech naming convention */ +void exprNode_mergeResolve (exprNode parent, exprNode child1, exprNode child2) { - temp->requiresConstraints = constraintList_makeNew(); - temp->ensuresConstraints = constraintList_makeNew(); - temp->trueEnsuresConstraints = constraintList_makeNew(); - temp->falseEnsuresConstraints = constraintList_makeNew(); - - exprNodeList_elements (arglist, el) - { - constraintList temp2; - exprNode_exprTraverse (el, FALSE, FALSE, sequencePoint); - temp2 = el->requiresConstraints; - el->requiresConstraints = exprNode_traversRequiresConstraints(el); - constraintList_free(temp2); - - temp2 = el->ensuresConstraints; - el->ensuresConstraints = exprNode_traversEnsuresConstraints(el); - constraintList_free(temp2); - - temp->requiresConstraints = constraintList_addList(temp->requiresConstraints, - el->requiresConstraints); - - temp->ensuresConstraints = constraintList_addList(temp->ensuresConstraints, - el->ensuresConstraints); - } - end_exprNodeList_elements; - -} - -constraintList checkCall (exprNode fcn, exprNodeList arglist) -{ - constraintList preconditions; - uentry temp; - DPRINTF ( (message ("Got call that %s ( %s) ", exprNode_unparse(fcn), exprNodeList_unparse (arglist ) ) ) ); - - temp = exprNode_getUentry (fcn); - - preconditions = uentry_getFcnPreconditions (temp); - - if (preconditions != constraintList_undefined) - { - preconditions = constraintList_togglePost (preconditions); - preconditions = constraintList_preserveCallInfo(preconditions, fcn); - preconditions = constraintList_doSRefFixConstraintParam (preconditions, arglist); - } - else - { - if (preconditions == NULL) - preconditions = constraintList_makeNew(); - } - DPRINTF (( message("Done checkCall\n") )); - DPRINTF (( message("Returning list %q ", constraintList_printDetailed(preconditions) ) )); - return preconditions; -} - -constraintList getPostConditions (exprNode fcn, exprNodeList arglist, exprNode fcnCall) -{ - constraintList postconditions; - uentry temp; - DPRINTF ( (message ("Got call that %s ( %s) ", exprNode_unparse(fcn), exprNodeList_unparse (arglist ) ) ) ); + constraintList temp, temp2; - temp = exprNode_getUentry (fcn); + DPRINTF((message ("magically merging constraint into parent:%s for", exprNode_unparse (parent) )) ); - postconditions = uentry_getFcnPostconditions (temp); + DPRINTF((message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2) ) ) ); - if (postconditions != constraintList_undefined) - { - postconditions = constraintList_doFixResult (postconditions, fcnCall); - postconditions = constraintList_doSRefFixConstraintParam (postconditions, arglist); - } - else + + if (exprNode_isUndefined(parent) ) { - postconditions = constraintList_makeNew(); + llassert (exprNode_isDefined(parent) ); + return; } - return postconditions; -} - -void mergeResolve (exprNode parent, exprNode child1, exprNode child2) -{ - constraintList temp, temp2; - - DPRINTF( (message ("magically merging constraint into parent:%s for", exprNode_unparse (parent) )) ); - - DPRINTF( (message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2) ) ) ); - + if (exprNode_isError (child1) || exprNode_isError(child2) ) { if (exprNode_isError (child1) && !exprNode_isError(child2) ) @@ -213,8 +166,8 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) parent->ensuresConstraints = constraintList_copy (child2->ensuresConstraints); DPRINTF((message ("Copied child constraints: pre: %s and post: %s", - constraintList_print( child2->requiresConstraints), - constraintList_print (child2->ensuresConstraints) + constraintList_unparse( child2->requiresConstraints), + constraintList_unparse (child2->ensuresConstraints) ) )); return; @@ -222,19 +175,17 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) else { llassert(exprNode_isError(child2) ); - //parent->requiresConstraints = constraintList_makeNew(); - //parent->ensuresConstraints = constraintList_makeNew(); return; } } llassert(!exprNode_isError (child1) && ! exprNode_isError(child2) ); - DPRINTF( (message ("Child constraints are %s %s and %s %s", - constraintList_print (child1->requiresConstraints), - constraintList_print (child1->ensuresConstraints), - constraintList_print (child2->requiresConstraints), - constraintList_print (child2->ensuresConstraints) + DPRINTF((message ("Child constraints are %s %s and %s %s", + constraintList_unparse (child1->requiresConstraints), + constraintList_unparse (child1->ensuresConstraints), + constraintList_unparse (child2->requiresConstraints), + constraintList_unparse (child2->ensuresConstraints) ) ) ); @@ -243,9 +194,9 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) parent->requiresConstraints = constraintList_copy (child1->requiresConstraints); if ( context_getFlag (FLG_ORCONSTRAINT) ) - temp = reflectChangesOr (child2->requiresConstraints, child1->ensuresConstraints); + temp = constraintList_reflectChangesOr (child2->requiresConstraints, child1->ensuresConstraints); else - temp = reflectChanges (child2->requiresConstraints, child1->ensuresConstraints); + temp = constraintList_reflectChanges(child2->requiresConstraints, child1->ensuresConstraints); temp2 = constraintList_mergeRequires (parent->requiresConstraints, temp); constraintList_free(parent->requiresConstraints); @@ -253,8 +204,8 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) parent->requiresConstraints = temp2; - DPRINTF( (message ("Parent requires constraints are %s ", - constraintList_print (parent->requiresConstraints) + DPRINTF((message ("Parent requires constraints are %s ", + constraintList_unparse (parent->requiresConstraints) ) ) ); constraintList_free(parent->ensuresConstraints); @@ -263,15 +214,12 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) child2->ensuresConstraints); - DPRINTF( (message ("Parent constraints are %s and %s ", - constraintList_print (parent->requiresConstraints), - constraintList_print (parent->ensuresConstraints) + DPRINTF((message ("Parent constraints are %s and %s ", + constraintList_unparse (parent->requiresConstraints), + constraintList_unparse (parent->ensuresConstraints) ) ) ); } - - - /*@only@*/ constraintList constraintList_subsumeEnsures (constraintList list1, constraintList list2) { @@ -280,8 +228,8 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) constraintList_elements (list1, el) { - DPRINTF ((message ("Examining %s", constraint_print (el) ) ) ); - if (!resolve (el, list2) ) + DPRINTF ((message ("Examining %s", constraint_unparse (el) ) ) ); + if (!constraintList_resolve (el, list2) ) { constraint temp; temp = constraint_copy(el); @@ -289,7 +237,7 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) } else { - DPRINTF ( (message ("Subsuming %s", constraint_print (el) ) ) ); + DPRINTF ((message ("Subsuming %s", constraint_unparse (el) ) ) ); } } end_constraintList_elements; @@ -298,92 +246,125 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) +/*used to be reflectChangesFreePre renamed for Czech naming conventino*/ /* tries to resolve constraints in list pre2 using post1 */ -/*@only@*/ constraintList reflectChangesFreePre (/*@only@*/ constraintList pre2, /*@observer@*/ constraintList post1) +/*@only@*/ constraintList constraintList_reflectChangesFreePre (/*@only@*/ constraintList pre2, /*@observer@*/ constraintList post1) { constraintList ret; - ret = reflectChanges (pre2, post1); + ret = constraintList_reflectChanges(pre2, post1); constraintList_free (pre2); return ret; } - /* tries to resolve constraints in list pre2 using post1 */ -/*@only@*/ constraintList reflectChanges (/*@observer@*/ constraintList pre2, /*@observer@*/ constraintList post1) + +static /*@only@*/ constraintList reflectChangesNoOr (/*@observer@*/ /*@temp@*/ constraintList pre2, /*@observer@*/ /*@temp@*/ constraintList post1) { constraintList ret; constraint temp; constraint temp2; + llassert (! context_getFlag (FLG_ORCONSTRAINT) ); + ret = constraintList_makeNew(); - DPRINTF((message ("reflectChanges: lists %s and %s", constraintList_print(pre2), constraintList_print(post1) ))); + DPRINTF((message ("reflectChanges: lists %s and %s", constraintList_unparse(pre2), constraintList_unparse(post1) ))); constraintList_elements (pre2, el) { - if (!resolve (el, post1) ) + if (!constraintList_resolve (el, post1) ) { - temp = substitute (el, post1); - if (!resolve (temp, post1) ) + temp = constraint_substitute (el, post1); + if (!constraintList_resolve (temp, post1) ) { - // try inequality substitution - //constraint temp2; - - // the inequality substitution may cause us to lose information - //so we don't want to store the result but we do it anyway + /* try inequality substitution + the inequality substitution may cause us to lose information + so we don't want to store the result but we do it anyway + */ temp2 = constraint_copy (temp); - // if (context_getFlag (FLG_ORCONSTRAINT) ) - temp2 = inequalitySubstitute (temp2, post1); - if (!resolve (temp2, post1) ) - { - temp2 = inequalitySubstituteUnsound (temp2, post1); - if (!resolve (temp2, post1) ) - ret = constraintList_add (ret, temp2); - } + temp2 = inequalitySubstitute (temp2, post1); + if (!constraintList_resolve (temp2, post1) ) + { + temp2 = inequalitySubstituteUnsound (temp2, post1); + if (!constraintList_resolve (temp2, post1) ) + ret = constraintList_add (ret, temp2); + else + constraint_free(temp2); + } + else + { + constraint_free(temp2); + } } constraint_free(temp); } } end_constraintList_elements; - DPRINTF((message ("reflectChanges: returning %s", constraintList_print(ret) ) ) ); + DPRINTF((message ("reflectChanges: returning %s", constraintList_unparse(ret) ) ) ); return ret; } +/* tries to resolve constraints in list pre2 using post1 */ +/*@only@*/ constraintList constraintList_reflectChanges(/*@observer@*/ constraintList pre2, /*@observer@*/ constraintList post1) +{ + constraintList temp; + + if ( context_getFlag (FLG_ORCONSTRAINT) ) + + temp = constraintList_reflectChangesOr (pre2, post1); + else + temp = reflectChangesNoOr(pre2, post1); + + return temp; +} -static constraint constraint_addOr (/*@returned@*/ constraint orig, /*@observer@*/ constraint or) +static constraint constraint_addOr (/*@returned@*/ constraint orig, /*@observer@*/ constraint orConstr) { constraint c; + + llassertfatal(constraint_isDefined(orig) ); + c = orig; - DPRINTF((message("constraint_addor: oring %s onto %s", constraint_printOr(or), constraint_printOr(orig) ) )); + DPRINTF((message("constraint_addor: oring %s onto %s", constraint_unparseOr(orConstr), constraint_unparseOr(orig) ) )); while (c->or != NULL) { c = c->or; } - c->or = constraint_copy(or); + + c->or = constraint_copy(orConstr); - DPRINTF((message("constraint_addor: returning %s",constraint_printOr(orig) ) )); + DPRINTF((message("constraint_addor: returning %s",constraint_unparseOr(orig) ) )); return orig; } -static bool resolveOr (/*@observer@*/ constraint c, /*@observer@*/ constraintList list) +static bool resolveOr ( /*@temp@*/ constraint c, /*@observer@*/ /*@temp@*/ constraintList list) { constraint temp; - DPRINTF(( message("resolveOr: constraint %s and list %s", constraint_printOr(c), constraintList_print(list) ) )); + int numberOr; + + numberOr = 0; + + llassertfatal(constraint_isDefined(c) ); + + DPRINTF(( message("resolveOr: constraint %s and list %s", constraint_unparseOr(c), constraintList_unparse(list) ) )); + temp = c; do { - if (resolve (temp, list) ) + if (constraintList_resolve (temp, list) ) return TRUE; temp = temp->or; + numberOr++; + llassert(numberOr <= 10); } while (constraint_isDefined(temp)); @@ -395,60 +376,150 @@ static bool resolveOr (/*@observer@*/ constraint c, /*@observer@*/ constraintLis static /*@only@*/ constraint doResolve (/*@only@*/ constraint c, constraintList post1, bool * resolved) { constraint temp; + + llassert(constraint_isDefined (c ) ); + + DPRINTF((message("doResolve:: call on constraint c = : %q and constraintList %q", + constraint_unparseOr(c), constraintList_unparse(post1) + ) + )); + + if (!resolveOr (c, post1) ) + { + + temp = constraint_substitute (c, post1); + + DPRINTF((message("doResolve:: after substitute temp is %q", + constraint_unparseOr(temp) + ) + )); - if (!resolveOr (c, post1) ) + if (!resolveOr (temp, post1) ) { - - temp = substitute (c, post1); + /* try inequality substitution */ + constraint temp2; - if (!resolveOr (temp, post1) ) + /* the inequality substitution may cause us to lose information + so we don't want to store the result but we do anyway + */ + temp2 = constraint_copy (c); + temp2 = inequalitySubstitute (temp2, post1); + + if (!resolveOr (temp2, post1) ) { - // try inequality substitution - constraint temp2; + constraint temp3; + temp3 = constraint_copy(temp2); - // the inequality substitution may cause us to lose information - //so we don't want to store the result but we do it anyway - temp2 = constraint_copy (c); - // if (context_getFlag (FLG_ORCONSTRAINT) ) - temp2 = inequalitySubstitute (temp2, post1); - if (!resolveOr (temp2, post1) ) + temp3 = inequalitySubstituteStrong (temp3, post1); + if (!resolveOr (temp3, post1) ) { temp2 = inequalitySubstituteUnsound (temp2, post1); if (!resolveOr (temp2, post1) ) { if (!constraint_same (temp, temp2) ) - temp = constraint_addOr (temp, temp2); + { + /* drl added 8/28/2002*/ + /*make sure that the information from + a post condition like i = i + 1 is transfered + */ + constraint tempSub; + tempSub = constraint_substitute (temp2, post1); + + DPRINTF(( + message("doResolve: adding %s ", + constraint_unparseOr(tempSub) + ) + )); + + DPRINTF(( + message("doResolve: not adding %s ", + constraint_unparseOr(temp2) + ) + )); + + temp = constraint_addOr (temp, tempSub); + constraint_free(tempSub); + + } + if (!constraint_same (temp, temp3) && !constraint_same (temp3, temp2) ) + { + /* drl added 8/28/2002*/ + /*make sure that the information from + a post condition like i = i + 1 is transfered + */ + constraint tempSub; + + tempSub = constraint_substitute (temp3, post1); + + DPRINTF(( + message("doResolve: adding %s ", + constraint_unparseOr(tempSub) + ) + )); + + + DPRINTF(( + message("doResolve: not adding %s ", + constraint_unparseOr(temp3) + ) + )); + + temp = constraint_addOr (temp, tempSub); + + constraint_free(tempSub); + } *resolved = FALSE; - + constraint_free(temp2); + constraint_free(temp3); constraint_free(c); - + return temp; } + constraint_free(temp2); + constraint_free(temp3); + } + else + { + constraint_free(temp2); + constraint_free(temp3); } - - constraint_free(temp2); } - constraint_free(temp); + else + { + constraint_free(temp2); + } + } - - constraint_free(c); - - *resolved = TRUE; - return NULL; - - - + constraint_free(temp); + } + constraint_free(c); + + *resolved = TRUE; + return NULL; } -static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /*@out@*/bool * resolved) +static /*@only@*/ constraint doResolveOr (/*@observer@*/ /*@temp@*/ constraint c, constraintList post1, /*@out@*/bool * resolved) { constraint ret; constraint next; constraint curr; + DPRINTF(( message("doResolveOr: constraint %s and list %s", constraint_unparseOr(c), constraintList_unparse(post1) ) )); + *resolved = FALSE; + + llassertfatal(constraint_isDefined(c) ); + ret = constraint_copy(c); + + llassert(constraint_isDefined(ret) ); + + if (constraintList_isEmpty(post1) ) + { + return ret; + } + next = ret->or; ret->or = NULL; @@ -458,12 +529,13 @@ static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /* { if (next != NULL) constraint_free(next); - - /*we don't need to free ret when resolved is false*/ - // constraint_free(ret); - /*@i1*/ return NULL; + + /*we don't need to free ret when resolved is false because ret is null*/ + llassert(ret == NULL); + + return NULL; } - + while (next != NULL) { curr = next; @@ -471,35 +543,35 @@ static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /* curr->or = NULL; curr = doResolve (curr, post1, resolved); - if (*resolved) + + if (*resolved) { /* curr is null so we don't try to free it*/ - //constraint_free(curr); + llassert(curr == NULL); if (next != NULL) constraint_free(next); + constraint_free(ret); - /*@i1*/ return NULL; + return NULL; } ret = constraint_addOr (ret, curr); constraint_free(curr); } + DPRINTF(( message("doResolveOr: returning ret = %s", constraint_unparseOr(ret) ) )); + return ret; } - - - - /* tries to resolve constraints in list pr2 using post1 */ -/*@only@*/ constraintList reflectChangesOr (constraintList pre2, constraintList post1) +/*@only@*/ constraintList constraintList_reflectChangesOr (constraintList pre2, constraintList post1) { bool resolved; constraintList ret; constraint temp; ret = constraintList_makeNew(); - DPRINTF((message ("reflectChangesOr: lists %s and %s", constraintList_print(pre2), constraintList_print(post1) ))); + DPRINTF((message ("constraintList_reflectChangesOr: lists %s and %s", constraintList_unparse(pre2), constraintList_unparse(post1) ))); constraintList_elements (pre2, el) { @@ -509,11 +581,19 @@ static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /* { ret = constraintList_add(ret, temp); } + else + { + /* we don't need to free temp when + resolved is false because temp is null */ + llassert(temp == NULL); + } + } end_constraintList_elements; - DPRINTF((message ("reflectChangesOr: returning %s", constraintList_print(ret) ) ) ); + DPRINTF((message ("constraintList_reflectChangesOr: returning %s", constraintList_unparse(ret) ) ) ); return ret; } + static /*@only@*/ constraintList reflectChangesEnsures (/*@observer@*/ constraintList pre2, constraintList post1) { constraintList ret; @@ -521,17 +601,19 @@ static /*@only@*/ constraintList reflectChangesEnsures (/*@observer@*/ constrain ret = constraintList_makeNew(); constraintList_elements (pre2, el) { - if (!resolve (el, post1) ) + if (!constraintList_resolve (el, post1) ) { - temp = substitute (el, post1); + temp = constraint_substitute (el, post1); llassert (temp != NULL); - if (!resolve (temp, post1) ) + if (!constraintList_resolve (temp, post1) ) ret = constraintList_add (ret, temp); + else + constraint_free(temp); } else { - DPRINTF ( (message ("Resolved away %s ", constraint_print(el) ) ) ); + DPRINTF ((message ("Resolved away %s ", constraint_unparse(el) ) ) ); } } end_constraintList_elements; @@ -553,27 +635,65 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai static bool constraint_conflict (constraint c1, constraint c2) { - - if (constraintExpr_similar(c1->lexpr, c2->lexpr) ) + if (!constraint_isDefined(c1) || !constraint_isDefined(c2)) + { + return FALSE; + } + + if (constraintExpr_similar (c1->lexpr, c2->lexpr)) { if (c1->ar == EQ) if (c1->ar == c2->ar) { - DPRINTF ( (message ("%s conflicts with %s ", constraint_print (c1), constraint_print(c2) ) ) ); + DPRINTF (("%s conflicts with %s", constraint_unparse (c1), constraint_unparse (c2))); return TRUE; } } - DPRINTF ( (message ("%s doesn't conflict with %s ", constraint_print (c1), constraint_print(c2) ) ) ); + /* This is a slight kludge to prevent circular constraints like + strlen(str) == maxRead(s) + strlen(str); + */ + + /*this code is functional but it may be worth cleaning up at some point. */ + + if (c1->ar == EQ) + if (c1->ar == c2->ar) + { + if (constraintExpr_search (c1->lexpr, c2->expr) ) + if (constraintExpr_isTerm(c1->lexpr) ) + { + constraintTerm term; + + term = constraintExpr_getTerm(c1->lexpr); + + if (constraintTerm_isExprNode(term) ) + { + DPRINTF ((message ("%s conflicts with %s ", constraint_unparse (c1), constraint_unparse(c2) ) ) ); + return TRUE; + } + } + } + + if (constraint_tooDeep(c1) || constraint_tooDeep(c2) ) + { + DPRINTF ((message ("%s conflicts with %s (constraint is too deep", constraint_unparse (c1), constraint_unparse(c2) ) ) ); + return TRUE; + } + + DPRINTF ((message ("%s doesn't conflict with %s ", constraint_unparse (c1), constraint_unparse(c2) ) ) ); return FALSE; } -static void constraint_fixConflict ( constraint good, /*@observer@*/ constraint conflicting) /*@modifies good@*/ +static void constraint_fixConflict (/*@temp@*/ constraint good, /*@temp@*/ /*@observer@*/ constraint conflicting) /*@modifies good@*/ { - if (conflicting->ar ==EQ ) + llassertfatal(constraint_isDefined(conflicting) ); + + if (conflicting->ar == EQ) { + llassertfatal (constraint_isDefined(good)); + DPRINTF (("Replacing here!")); good->expr = constraintExpr_searchandreplace (good->expr, conflicting->lexpr, conflicting->expr); good = constraint_simplify (good); } @@ -597,8 +717,11 @@ static bool conflict (constraint c, constraintList list) } -//check if constraint in list1 conflicts with constraints in List2. If so we -//remove form list1 and change list2. +/* + check if constraint in list1 conflicts with constraints in List2. If so we + remove form list1 and change list2. +*/ + constraintList constraintList_fixConflicts (constraintList list1, constraintList list2) { constraintList ret; @@ -617,39 +740,60 @@ constraintList constraintList_fixConflicts (constraintList list1, constraintList return ret; } -/*returns true if constraint post satifies cosntriant pre */ -static bool satifies (constraint pre, constraint post) +/*returns true if constraint post satisfies cosntriant pre */ + +static bool constraintResolve_satisfies (constraint pre, constraint post) { - if (constraint_isAlwaysTrue (pre) ) + if (!constraint_isDefined (pre)) + { + return TRUE; + } + + if (!constraint_isDefined(post)) + { + return FALSE; + } + + if (constraint_isAlwaysTrue (pre)) return TRUE; if (!constraintExpr_similar (pre->lexpr, post->lexpr) ) { return FALSE; } - if (post->expr == NULL) + + if (constraintExpr_isUndefined(post->expr)) { llassert(FALSE); return FALSE; } - + return rangeCheck (pre->ar, pre->expr, post->ar, post->expr); } -bool resolve (/*@observer@*/ constraint c, /*@observer@*/ constraintList p) +bool constraintList_resolve (/*@temp@*/ /*@observer@*/ constraint c, + /*@temp@*/ /*@observer@*/ constraintList p) { + DPRINTF (("[resolve] Trying to resolve constraint: %s using %s", + constraint_unparse (c), + constraintList_unparse (p))); + constraintList_elements (p, el) { - if ( satifies (c, el) ) + if (constraintResolve_satisfies (c, el)) { - DPRINTF ( (message ("\n%s Satifies %s\n ", constraint_print(el), constraint_print(c) ) ) ); + DPRINTF (("constraintList_resolve: %s satifies %s", + constraint_unparse (el), constraint_unparse (c))); return TRUE; } - DPRINTF ( (message ("\n%s does not satify %s\n ", constraint_print(el), constraint_print(c) ) ) ); + + DPRINTF (("constraintList_resolve: %s does not satify %s\n ", + constraint_unparse (el), constraint_unparse (c))); } end_constraintList_elements; - DPRINTF ( (message ("no constraints satify %s", constraint_print(c) ) )); + + DPRINTF (("No constraints satify: %s", constraint_unparse (c))); return FALSE; } @@ -659,7 +803,7 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) { case GTE: case GT: - if ( (ar2 == GT) || (ar2 == GTE) || (ar2 == EQ) ) + if ((ar2 == GT) || (ar2 == GTE) || (ar2 == EQ)) { return TRUE; } @@ -672,8 +816,7 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) case LT: case LTE: - // llassert(FALSE); - if ( (ar2 == LT) || (ar2 == LTE) || (ar2 == EQ) ) + if ((ar2 == LT) || (ar2 == LTE) || (ar2 == EQ)) return TRUE; break; default: @@ -682,19 +825,160 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) return FALSE; } +/*checks for the case expr2 == sizeof buf1 and buf1 is a fixed array*/ +static bool sizeofBufComp(constraintExpr buf1, constraintExpr expr2) +{ + constraintTerm ct; + exprNode e, t; + sRef s1, s2; + + llassertfatal(constraintExpr_isDefined(buf1) && + constraintExpr_isDefined(expr2) ); + + /*@access constraintExpr@*/ + + if ((expr2->kind != term) && (buf1->kind != term) ) + return FALSE; + + + ct = constraintExprData_termGetTerm(expr2->data); + + if (!constraintTerm_isExprNode(ct) ) + return FALSE; + + e = constraintTerm_getExprNode(ct); + + llassert (exprNode_isDefined(e)); + + if (! (exprNode_isDefined(e))) + return FALSE; + + if (e->kind != XPR_SIZEOF) + return FALSE; + + t = exprData_getSingle (e->edata); + s1 = exprNode_getSref (t); + + s2 = constraintTerm_getsRef(constraintExprData_termGetTerm(buf1->data) ); + + /*drl this may be the wronge thing to test for but this + seems to work correctly*/ + if (sRef_similarRelaxed(s1, s2) || sRef_sameName (s1, s2) ) + { + /* origly checked that ctype_isFixedArray(sRef_getType(s2)) but + removed that test */ + return TRUE; + } + return FALSE; +} + +/* look for the special case of + maxSet(buf) >= sizeof(buf) - 1 +*/ + +/*drl eventually it would be good to check that + buf is of type char.*/ + +static bool sizeOfMaxSet( /*@observer@*/ /*@temp@*/ constraint c) +{ + constraintExpr l, r, buf1, buf2, con; + + DPRINTF(( message("sizeOfMaxSet: checking %s ", constraint_unparse(c) ) + )); + + llassertfatal (constraint_isDefined(c) ); + + l = c->lexpr; + r = c->expr; + + if (!((c->ar == EQ) || (c->ar == GTE) || (c->ar == LTE) ) ) + return FALSE; + + llassert (constraintExpr_isDefined(l) ); + llassert (constraintExpr_isDefined(r) ); + + /*check if the constraintExpr is MaxSet(buf) */ + if (l->kind == unaryExpr) + { + if (constraintExprData_unaryExprGetOp(l->data) == MAXSET) + { + buf1 = constraintExprData_unaryExprGetExpr(l->data); + } + else + return FALSE; + } + else + return FALSE; + + + if (r->kind != binaryexpr) + return FALSE; + + buf2 = constraintExprData_binaryExprGetExpr1(r->data); + con = constraintExprData_binaryExprGetExpr2(r->data); + + if (constraintExprData_binaryExprGetOp(r->data) == BINARYOP_MINUS) + { + if (constraintExpr_canGetValue(con) ) + { + long i; + + i = constraintExpr_getValue(con); + if (i != 1) + { + return FALSE; + } + } + else + return FALSE; + } + + if (constraintExprData_binaryExprGetOp(r->data) == BINARYOP_PLUS) + { + if (constraintExpr_canGetValue(con) ) + { + long i; + + i = constraintExpr_getValue(con); + if (i != -1) + { + return FALSE; + } + } + else + return FALSE; + } + + if (sizeofBufComp(buf1, buf2)) + { + return TRUE; + } + else + { + return FALSE; + } +} +/*@noaccess constraintExpr@*/ + /* We look for constraint which are tautologies */ -bool constraint_isAlwaysTrue (/*@observer@*/ constraint c) +bool constraint_isAlwaysTrue (/*@observer@*/ /*@temp@*/ constraint c) { constraintExpr l, r; - bool /*@unused@*/ lHasConstant, rHasConstant; - int /*@unused@*/ lConstant, rConstant; + bool rHasConstant; + int rConstant; + + + llassert (constraint_isDefined(c) ); l = c->lexpr; r = c->expr; - DPRINTF(( message("constraint_IsAlwaysTrue:examining %s", constraint_print(c) ) )); - + DPRINTF(( message("constraint_IsAlwaysTrue:examining %s", constraint_unparse(c) ) )); + + if (sizeOfMaxSet(c) ) + return TRUE; + if (constraintExpr_canGetValue(l) && constraintExpr_canGetValue(r) ) { int cmp; @@ -719,7 +1003,7 @@ bool constraint_isAlwaysTrue (/*@observer@*/ constraint c) } } - if (constraintExpr_similar (l,r) ) + if (constraintExpr_similar (l,r)) { switch (c->ar) { @@ -741,13 +1025,12 @@ bool constraint_isAlwaysTrue (/*@observer@*/ constraint c) l = constraintExpr_copy (c->lexpr); r = constraintExpr_copy (c->expr); - // l = constraintExpr_propagateConstants (l, &lHasConstant, &lConstant); r = constraintExpr_propagateConstants (r, &rHasConstant, &rConstant); if (constraintExpr_similar (l,r) && (rHasConstant ) ) { - DPRINTF(( message("constraint_IsAlwaysTrue: after removing constants %s and %s are similar", constraintExpr_unparse(l), constraintExpr_unparse(r) ) )); - DPRINTF(( message("constraint_IsAlwaysTrue: rconstant is %d", rConstant ) )); + DPRINTF(( message("constraint_IsAlwaysTrue: after removing constants %s and %s are similar", constraintExpr_unparse(l), constraintExpr_unparse(r) ) )); + DPRINTF(( message("constraint_IsAlwaysTrue: rconstant is %d", rConstant ) )); constraintExpr_free(l); constraintExpr_free(r); @@ -775,7 +1058,7 @@ bool constraint_isAlwaysTrue (/*@observer@*/ constraint c) { constraintExpr_free(l); constraintExpr_free(r); - DPRINTF(( message("Constraint %s is not always true", constraint_print(c) ) )); + DPRINTF(( message("Constraint %s is not always true", constraint_unparse(c) ) )); return FALSE; } @@ -785,109 +1068,128 @@ bool constraint_isAlwaysTrue (/*@observer@*/ constraint c) static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arithType ar2, /*@observer@*/ constraintExpr expr2) { - DPRINTF ((message ("Doing Range CHECK %s and %s", constraintExpr_unparse(expr1), constraintExpr_unparse(expr2) ) )); + DPRINTF (("Doing range check %s and %s", + constraintExpr_unparse (expr1), constraintExpr_unparse (expr2))); - if (! arithType_canResolve (ar1, ar2) ) + if (!arithType_canResolve (ar1, ar2)) return FALSE; switch (ar1) - { - case GTE: + { + case GTE: if (constraintExpr_similar (expr1, expr2) ) - return TRUE; + return TRUE; /*@fallthrough@*/ - case GT: - if (! (constraintExpr_canGetValue (expr1) && - constraintExpr_canGetValue (expr2) ) ) - { - constraintExpr e1, e2; - bool p1, p2; - int const1, const2; - - e1 = constraintExpr_copy(expr1); - e2 = constraintExpr_copy(expr2); - - e1 = constraintExpr_propagateConstants (e1, &p1, &const1); - - e2 = constraintExpr_propagateConstants (e2, &p2, &const2); - - if (p1 && p2) - if (const1 <= const2) - if (constraintExpr_similar (e1, e2) ) - { - constraintExpr_free(e1); - constraintExpr_free(e2); - return TRUE; - } - - DPRINTF( ("Can't Get value")); - - constraintExpr_free(e1); - constraintExpr_free(e2); - return FALSE; - } - - if (constraintExpr_compare (expr2, expr1) >= 0) - return TRUE; - - return FALSE; - case EQ: - if (constraintExpr_similar (expr1, expr2) ) - return TRUE; - - return FALSE; - case LTE: - if (constraintExpr_similar (expr1, expr2) ) - return TRUE; - /*@fallthrough@*/ - case LT: - if (! (constraintExpr_canGetValue (expr1) && - constraintExpr_canGetValue (expr2) ) ) - { - constraintExpr e1, e2; - bool p1, p2; - int const1, const2; - - e1 = constraintExpr_copy(expr1); - e2 = constraintExpr_copy(expr2); - - e1 = constraintExpr_propagateConstants (e1, &p1, &const1); - - e2 = constraintExpr_propagateConstants (e2, &p2, &const2); - - if (p1 && p2) - if (const1 >= const2) - if (constraintExpr_similar (e1, e2) ) - { - constraintExpr_free(e1); - constraintExpr_free(e2); - return TRUE; - } - constraintExpr_free(e1); - constraintExpr_free(e2); - - DPRINTF( ("Can't Get value")); - return FALSE; - } - - if (constraintExpr_compare (expr2, expr1) <= 0) - return TRUE; - - return FALSE; - - default: - llcontbug((message("Unhandled case in switch: %q", arithType_print(ar1) ) ) ); - } + case GT: + if (! (constraintExpr_canGetValue (expr1) && + constraintExpr_canGetValue (expr2) ) ) + { + constraintExpr e1, e2; + bool p1, p2; + int const1, const2; + + e1 = constraintExpr_copy(expr1); + e2 = constraintExpr_copy(expr2); + + e1 = constraintExpr_propagateConstants (e1, &p1, &const1); + e2 = constraintExpr_propagateConstants (e2, &p2, &const2); + + if (p1 || p2) + { + if (!p1) + const1 = 0; + + if (!p2) + const2 = 0; + + if (const1 <= const2) + if (constraintExpr_similar (e1, e2) ) + { + constraintExpr_free(e1); + constraintExpr_free(e2); + return TRUE; + } + } + DPRINTF(("Can't Get value")); + + constraintExpr_free(e1); + constraintExpr_free(e2); + return FALSE; + } + + if (constraintExpr_compare (expr2, expr1) >= 0) + return TRUE; + + return FALSE; + case EQ: + if (constraintExpr_similar (expr1, expr2) ) + return TRUE; + + return FALSE; + case LTE: + if (constraintExpr_similar (expr1, expr2) ) + return TRUE; + /*@fallthrough@*/ + case LT: + if (! (constraintExpr_canGetValue (expr1) && + constraintExpr_canGetValue (expr2) ) ) + { + constraintExpr e1, e2; + bool p1, p2; + int const1, const2; + + e1 = constraintExpr_copy(expr1); + e2 = constraintExpr_copy(expr2); + + e1 = constraintExpr_propagateConstants (e1, &p1, &const1); + + e2 = constraintExpr_propagateConstants (e2, &p2, &const2); + + if (p1 || p2) + { + if (!p1) + const1 = 0; + + if (!p2) + const2 = 0; + + if (const1 >= const2) + if (constraintExpr_similar (e1, e2) ) + { + constraintExpr_free(e1); + constraintExpr_free(e2); + return TRUE; + } + } + constraintExpr_free(e1); + constraintExpr_free(e2); + + DPRINTF(("Can't Get value")); + return FALSE; + } + + if (constraintExpr_compare (expr2, expr1) <= 0) + return TRUE; + + return FALSE; + + default: + llcontbug((message("Unhandled case in switch: %q", arithType_print(ar1) ) ) ); + } BADEXIT; } - -static constraint constraint_searchandreplace (/*@returned@*/ constraint c, constraintExpr old, constraintExpr new) +static constraint constraint_searchandreplace (/*@returned@*/ constraint c, constraintExpr old, constraintExpr newExpr) { - DPRINTF (("Doing replace for lexpr") ); - c->lexpr = constraintExpr_searchandreplace (c->lexpr, old, new); - DPRINTF (("Doing replace for expr") ); - c->expr = constraintExpr_searchandreplace (c->expr, old, new); + llassertfatal (constraint_isDefined(c)); + + DPRINTF (("Starting replace lexpr [%p]: %s < %s ==> %s > in %s", c, + constraintExpr_unparse (c->lexpr), + constraintExpr_unparse (old), constraintExpr_unparse (newExpr), + constraint_unparse (c))); + c->lexpr = constraintExpr_searchandreplace (c->lexpr, old, newExpr); + DPRINTF (("Finished replace lexpr [%p]: %s", c, constraintExpr_unparse (c->lexpr))); + c->expr = constraintExpr_searchandreplace (c->expr, old, newExpr); return c; } @@ -895,34 +1197,36 @@ bool constraint_search (constraint c, constraintExpr old) /*@*/ { bool ret; ret = FALSE; - + + llassert (constraint_isDefined (c)); + ret = constraintExpr_search (c->lexpr, old); ret = ret || constraintExpr_search (c->expr, old); return ret; } -//adjust file locs and stuff +/* adjust file locs and stuff */ static constraint constraint_adjust (/*@returned@*/ constraint substitute, /*@observer@*/ constraint old) { fileloc loc1, loc2, loc3; - DPRINTF ( (message("Start adjust on %s and %s", constraint_print(substitute), - constraint_print(old)) + DPRINTF ((message("Start adjust on %s and %s", constraint_unparse(substitute), + constraint_unparse(old)) )); + llassert(constraint_isDefined(substitute)); + llassert(constraint_isDefined(old)); + loc1 = constraint_getFileloc (old); - - loc2 = constraintExpr_getFileloc (substitute->lexpr); - - loc3 = constraintExpr_getFileloc (substitute->expr); - + loc2 = constraintExpr_loc (substitute->lexpr); + loc3 = constraintExpr_loc (substitute->expr); - // special case of an equality that "contains itself" + /* special case of an equality that "contains itself" */ if (constraintExpr_search (substitute->expr, substitute->lexpr) ) if (fileloc_closer (loc1, loc3, loc2)) { constraintExpr temp; - DPRINTF ( (message("Doing adjust on %s", constraint_print(substitute) ) + DPRINTF ((message("Doing adjust on %s", constraint_unparse(substitute) ) )); temp = substitute->lexpr; substitute->lexpr = substitute->expr; @@ -944,35 +1248,98 @@ static constraint constraint_adjust (/*@returned@*/ constraint substitute, /*@ob Warning this is sound but throws out information */ + constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p) { + llassert(constraint_isDefined(c) ); + if (c->ar != GTE) return c; constraintList_elements (p, el) { - if ( el->ar == LT) - // if (!constraint_conflict (c, el) ) + + llassert(constraint_isDefined(el) ); + + if ((el->ar == LT ) ) { - //constraint temp; constraintExpr temp2; - /*@i22*/ + if (constraintExpr_same (el->expr, c->expr) ) + { + DPRINTF((message ("inequalitySubstitute Replacing %q in %q with %q", + constraintExpr_print (c->expr), + constraint_unparse (c), + constraintExpr_print (el->expr) ) + )); + temp2 = constraintExpr_copy (el->lexpr); + constraintExpr_free(c->expr); + c->expr = constraintExpr_makeIncConstraintExpr (temp2); - //temp = constraint_copy(el); + } - // temp = constraint_adjust(temp, c); + } + } + end_constraintList_elements; - if (constraintExpr_same (el->expr, c->expr) ) + c = constraint_simplify(c); + return c; +} + + +/* drl7x 7/26/001 + + THis function is like inequalitySubstitute but it adds the rule + added the rules x >= y && y <= b ===> x >= b + x >= y && y < b ===> x >= b + 1 + + This is sound but sonce it throws out additional information it should only one used + if we're oring constraints. + */ + +static constraint inequalitySubstituteStrong (/*@returned@*/ constraint c, constraintList p) +{ + DPRINTF (( message ("inequalitySubstituteStrong examining substituting for %q", constraint_unparse(c) ) )); + + llassert(constraint_isDefined(c) ); + + if (! (constraint_isDefined(c) ) ) + { + return c; + } + + if (c->ar != GTE) + return c; + + DPRINTF (( message ("inequalitySubstituteStrong examining substituting for %q with %q", + constraint_unparse(c), constraintList_unparse(p) ) )); + constraintList_elements (p, el) + { + + DPRINTF (( message ("inequalitySubstituteStrong examining substituting %s on %s", constraint_unparse(el), constraint_unparse(c) ) )); + + llassert(constraint_isDefined(el) ); + if ((el->ar == LT ) || (el->ar == LTE ) ) + { + constraintExpr temp2; + + if (constraintExpr_same (el->lexpr, c->expr) ) { DPRINTF((message ("inequalitySubstitute Replacing %s in %s with %s", constraintExpr_print (c->expr), - constraint_print (c), + constraint_unparse (c), constraintExpr_print (el->expr) ) )); - temp2 = constraintExpr_copy (el->lexpr); + temp2 = constraintExpr_copy (el->expr); constraintExpr_free(c->expr); - c->expr = constraintExpr_makeIncConstraintExpr (temp2); + if ((el->ar == LTE ) ) + { + c->expr = temp2; + } + else + { + c->expr = constraintExpr_makeIncConstraintExpr (temp2); + } } } @@ -983,6 +1350,7 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p return c; } + /* This function performs substitutions based on the rule: for a constraint of the form expr1 >= expr2; a < b => a = b -1 for all a in expr1. This will work in most cases. @@ -993,22 +1361,22 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint c, constraintList p) { DPRINTF (( message ("Doing inequalitySubstituteUnsound " ) )); + + llassert(constraint_isDefined(c) ); if (c->ar != GTE) return c; constraintList_elements (p, el) { - DPRINTF (( message ("inequalitySubstituteUnsound examining substituting %s on %s", constraint_print(el), constraint_print(c) ) )); - if ( ( el->ar == LTE) || (el->ar == LT) ) - // if (!constraint_conflict (c, el) ) + + llassert(constraint_isDefined(el) ); + + DPRINTF (( message ("inequalitySubstituteUnsound examining substituting %s on %s", constraint_unparse(el), constraint_unparse(c) ) )); + if (( el->ar == LTE) || (el->ar == LT) ) { - // constraint temp; constraintExpr temp2; - - //temp = constraint_copy(el); - - // temp = constraint_adjust(temp, c); + temp2 = constraintExpr_copy (el->expr); if (el->ar == LT) @@ -1029,37 +1397,36 @@ static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint c, co return c; } -/*@only@*/ constraint substitute (/*@observer@*/ constraint c, constraintList p) +/*@only@*/ constraint constraint_substitute (/*@observer@*/ /*@temp@*/ constraint c, constraintList p) { - constraint ret; + constraint ret = constraint_copy (c); - ret = constraint_copy(c); constraintList_elements (p, el) { - if ( el->ar == EQ) - if (!constraint_conflict (ret, el) ) - - { - constraint temp; - - temp = constraint_copy(el); - - temp = constraint_adjust(temp, ret); - - DPRINTF((message ("Substituting %s in the constraint %s", - constraint_print (temp), constraint_print (ret) - ) ) ); - + if (constraint_isDefined (el)) + { + if ( el->ar == EQ) + if (!constraint_conflict (ret, el)) + { + constraint temp = constraint_copy(el); + temp = constraint_adjust(temp, ret); + + llassert(constraint_isDefined(temp) ); + + + DPRINTF (("constraint_substitute :: Substituting in %s using %s", + constraint_unparse (ret), constraint_unparse (temp))); - ret = constraint_searchandreplace (ret, temp->lexpr, temp->expr); - DPRINTF(( message ("The new constraint is %s", constraint_print (ret) ) )); - constraint_free(temp); - } + ret = constraint_searchandreplace (ret, temp->lexpr, temp->expr); + DPRINTF (("constraint_substitute :: The new constraint is %s", constraint_unparse (ret)));; + constraint_free(temp); + } + } } end_constraintList_elements; - DPRINTF(( message ("The finial new constraint is %s", constraint_print (ret) ) )); - ret = constraint_simplify(ret); + ret = constraint_simplify (ret); + DPRINTF(( message (" constraint_substitute :: The final new constraint is %s", constraint_unparse (ret) ) )); return ret; } @@ -1087,9 +1454,9 @@ return ret; constraintList_elements(target, el) { constraint temp; - #warning make sure that a side effect is not expected + /* drl possible problem : warning make sure that a side effect is not expected */ - temp = substitute(el, subList); + temp = constraint_substitute(el, subList); ret = constraintList_add (ret, temp); } end_constraintList_elements; @@ -1097,11 +1464,14 @@ return ret; return ret; } -constraint constraint_solve (/*@returned@*/ constraint c) +static constraint constraint_solve (/*@returned@*/ constraint c) { - DPRINTF( (message ("Solving %s\n", constraint_print(c) ) ) ); + + llassert(constraint_isDefined(c) ); + + DPRINTF((message ("Solving %s\n", constraint_unparse(c) ) ) ); c->expr = constraintExpr_solveBinaryExpr (c->lexpr, c->expr); - DPRINTF( (message ("Solved and got %s\n", constraint_print(c) ) ) ); + DPRINTF((message ("Solved and got %s\n", constraint_unparse(c) ) ) ); return c; } @@ -1129,6 +1499,9 @@ static arithType flipAr (arithType ar) static constraint constraint_swapLeftRight (/*@returned@*/ constraint c) { constraintExpr temp; + + llassert(constraint_isDefined(c) ); + c->ar = flipAr (c->ar); temp = c->lexpr; c->lexpr = c->expr; @@ -1141,6 +1514,18 @@ static constraint constraint_swapLeftRight (/*@returned@*/ constraint c) constraint constraint_simplify ( /*@returned@*/ constraint c) { + + llassert(constraint_isDefined(c) ); + + DPRINTF(( message("constraint_simplify on %q ", constraint_unparse(c) ) )); + + if (constraint_tooDeep(c)) + { + DPRINTF(( message("constraint_simplify: constraint to complex aborting %q ", constraint_unparse(c) ) )); + return c; + + } + c->lexpr = constraintExpr_simplify (c->lexpr); c->expr = constraintExpr_simplify (c->expr); @@ -1158,6 +1543,9 @@ constraint constraint_simplify ( /*@returned@*/ constraint c) /*I don't think this will be an infinate loop*/ c = constraint_simplify(c); } + + DPRINTF(( message("constraint_simplify returning %q ", constraint_unparse(c) ) )); + return c; }