X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/2934b455c4074408a0f819009c071456f021ba21..15b3d2b27a3dce7a3b65e88fb0d1732e235117f4:/src/constraintResolve.c diff --git a/src/constraintResolve.c b/src/constraintResolve.c index de80027..a79c3ff 100644 --- a/src/constraintResolve.c +++ b/src/constraintResolve.c @@ -12,24 +12,29 @@ # include "cgrammar_tokens.h" # include "exprChecks.h" -# include "aliasChecks.h" # include "exprNodeSList.h" /*@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 inequalitySubstitute (/*@returned@*/ constraint p_c, constraintList p_p); -static constraint constraint_searchandreplace (/*@returned@*/ constraint c, constraintExpr old, constraintExpr new); +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 bool resolveOr (/*@observer@*/ constraint c, /*@observer@*/ constraintList list); +static constraint inequalitySubstituteStrong (/*@returned@*/ constraint p_c, constraintList p_p); -static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constraintList pre2, constraintList post1); +static constraint constraint_searchandreplace (/*@returned@*/ constraint p_c, constraintExpr p_old, constraintExpr p_newExpr); + + +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); /*********************************************/ @@ -101,11 +106,11 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai DPRINTF((message ("constraintList_mergeRequires: merging %s and %s ", constraintList_print (list1), constraintList_print(list2) ) ) ); /* get constraints in list1 not satified by list2 */ - temp = reflectChanges (list1, list2); + temp = constraintList_reflectChanges(list1, list2); DPRINTF((message ("constraintList_mergeRequires: temp = %s", constraintList_print(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) ) ) ); @@ -116,85 +121,8 @@ static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constrai return ret; } -void checkArgumentList (/*@out@*/ exprNode temp, exprNodeList arglist, fileloc sequencePoint) -{ - 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 ) ) ) ); - - temp = exprNode_getUentry (fcn); - - postconditions = uentry_getFcnPostconditions (temp); - - if (postconditions != constraintList_undefined) - { - postconditions = constraintList_doFixResult (postconditions, fcnCall); - postconditions = constraintList_doSRefFixConstraintParam (postconditions, arglist); - } - else - { - postconditions = constraintList_makeNew(); - } - - return postconditions; -} - -void mergeResolve (exprNode parent, exprNode child1, exprNode child2) +/* old name mergeResolve renamed for czech naming convention */ +void exprNode_mergeResolve (exprNode parent, exprNode child1, exprNode child2) { constraintList temp, temp2; @@ -243,9 +171,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); @@ -281,7 +209,7 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) { DPRINTF ((message ("Examining %s", constraint_print (el) ) ) ); - if (!resolve (el, list2) ) + if (!constraintList_resolve (el, list2) ) { constraint temp; temp = constraint_copy(el); @@ -298,12 +226,13 @@ 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); @@ -311,23 +240,27 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) } + /* 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) ))); 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; @@ -336,13 +269,19 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) //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); } @@ -352,19 +291,33 @@ void mergeResolve (exprNode parent, exprNode child1, exprNode child2) 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; 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_printOr(orConstr), constraint_printOr(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) ) )); @@ -372,18 +325,23 @@ static constraint constraint_addOr (/*@returned@*/ constraint orig, /*@observer@ } -static bool resolveOr (/*@observer@*/ constraint c, /*@observer@*/ constraintList list) +static bool resolveOr ( /*@temp@*/ constraint c, /*@observer@*/ /*@temp@*/ constraintList list) { constraint temp; + int numberOr; + + numberOr = 0; DPRINTF(( message("resolveOr: constraint %s and list %s", constraint_printOr(c), constraintList_print(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 +353,94 @@ static bool resolveOr (/*@observer@*/ constraint c, /*@observer@*/ constraintLis static /*@only@*/ constraint doResolve (/*@only@*/ constraint c, constraintList post1, bool * resolved) { constraint temp; + + llassert(constraint_isUndefined (c->or ) ); - if (!resolveOr (c, post1) ) + if (!resolveOr (c, post1) ) + { + + temp = constraint_substitute (c, post1); + + if (!resolveOr (temp, post1) ) { - - temp = substitute (c, post1); + // try inequality substitution + constraint temp2; - if (!resolveOr (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 + //so we don't want to store the result but we do anyway temp2 = constraint_copy (c); // if (context_getFlag (FLG_ORCONSTRAINT) ) - temp2 = inequalitySubstitute (temp2, post1); + temp2 = inequalitySubstitute (temp2, post1); if (!resolveOr (temp2, post1) ) { - temp2 = inequalitySubstituteUnsound (temp2, post1); - if (!resolveOr (temp2, post1) ) + constraint temp3; + temp3 = constraint_copy(temp2); + + temp3 = inequalitySubstituteStrong (temp3, post1); + if (!resolveOr (temp3, post1) ) { - if (!constraint_same (temp, temp2) ) - temp = constraint_addOr (temp, temp2); - *resolved = FALSE; - + temp2 = inequalitySubstituteUnsound (temp2, post1); + if (!resolveOr (temp2, post1) ) + { + if (!constraint_same (temp, temp2) ) + temp = constraint_addOr (temp, temp2); + + if (!constraint_same (temp, temp3) && !constraint_same (temp3, temp2) ) + temp = constraint_addOr (temp, temp3); + + *resolved = FALSE; + + constraint_free(temp2); + constraint_free(temp3); + constraint_free(c); + + return temp; + } constraint_free(temp2); - constraint_free(c); - - return temp; + constraint_free(temp3); + } + else + { + constraint_free(temp2); + constraint_free(temp3); } } - - constraint_free(temp2); + else + { + constraint_free(temp2); + } + } 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_printOr(c), constraintList_print(post1) ) )); + + *resolved = FALSE; + + ret = constraint_copy(c); + + if (constraintList_isEmpty(post1) ) + { + return ret; + } + next = ret->or; ret->or = NULL; @@ -458,12 +450,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 +464,32 @@ static /*@only@*/ constraint doResolveOr (constraint c, constraintList post1, /* curr->or = NULL; curr = doResolve (curr, post1, 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); } - 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_print(pre2), constraintList_print(post1) ))); constraintList_elements (pre2, el) { @@ -509,11 +499,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_print(ret) ) ) ); return ret; } + static /*@only@*/ constraintList reflectChangesEnsures (/*@observer@*/ constraintList pre2, constraintList post1) { constraintList ret; @@ -521,13 +519,15 @@ 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 { @@ -564,13 +564,42 @@ static bool constraint_conflict (constraint c1, constraint c2) } } + // This is a slight kludg to prevent circular constraints like + // strlen(str) == maxRead(s) + strlen(str); + + /*@i324234*/ //clean this up + + 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_print (c1), constraint_print(c2) ) ) ); + return TRUE; + } + } + } + + if (constraint_tooDeep(c1) || constraint_tooDeep(c2) ) + { + DPRINTF ( (message ("%s conflicts with %s (constraint is too deep", constraint_print (c1), constraint_print(c2) ) ) ); + return TRUE; + } + DPRINTF ( (message ("%s doesn't conflict with %s ", constraint_print (c1), constraint_print(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 ) { @@ -627,7 +656,7 @@ static bool satifies (constraint pre, constraint post) { return FALSE; } - if (post->expr == NULL) + if (constraintExpr_isUndefined(post->expr)) { llassert(FALSE); return FALSE; @@ -637,7 +666,7 @@ static bool satifies (constraint pre, constraint post) } -bool resolve (/*@observer@*/ constraint c, /*@observer@*/ constraintList p) +bool constraintList_resolve (/*@temp@*/ /*@observer@*/ constraint c, /*@temp@*/ /*@observer@*/ constraintList p) { constraintList_elements (p, el) { @@ -684,11 +713,11 @@ static bool arithType_canResolve (arithType ar1, arithType ar2) /* 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; l = c->lexpr; r = c->expr; @@ -793,101 +822,115 @@ static bool rangeCheck (arithType ar1, /*@observer@*/ constraintExpr expr1, arit switch (ar1) { case GTE: - if (constraintExpr_similar (expr1, expr2) ) - 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_similar (expr1, expr2) ) + 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; - } - constraintExpr_free(e1); - constraintExpr_free(e2); - - DPRINTF( ("Can't Get value")); - return FALSE; - } - - if (constraintExpr_compare (expr2, expr1) <= 0) - return TRUE; + 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; - - default: - llcontbug((message("Unhandled case in switch: %q", arithType_print(ar1) ) ) ); - } + 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); + c->lexpr = constraintExpr_searchandreplace (c->lexpr, old, newExpr); DPRINTF (("Doing replace for expr") ); - c->expr = constraintExpr_searchandreplace (c->expr, old, new); + c->expr = constraintExpr_searchandreplace (c->expr, old, newExpr); return c; } @@ -944,6 +987,7 @@ static constraint constraint_adjust (/*@returned@*/ constraint substitute, /*@ob Warning this is sound but throws out information */ + constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p) { if (c->ar != GTE) @@ -951,7 +995,7 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p constraintList_elements (p, el) { - if ( el->ar == LT) + if ( (el->ar == LT ) ) // if (!constraint_conflict (c, el) ) { //constraint temp; @@ -965,7 +1009,7 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p if (constraintExpr_same (el->expr, c->expr) ) { - DPRINTF((message ("inequalitySubstitute Replacing %s in %s with %s", + DPRINTF((message ("inequalitySubstitute Replacing %q in %q with %q", constraintExpr_print (c->expr), constraint_print (c), constraintExpr_print (el->expr) ) @@ -973,6 +1017,7 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p temp2 = constraintExpr_copy (el->lexpr); constraintExpr_free(c->expr); c->expr = constraintExpr_makeIncConstraintExpr (temp2); + } } @@ -983,6 +1028,70 @@ constraint inequalitySubstitute (/*@returned@*/ constraint c, constraintList p 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_print(c) ) )); + + if (c->ar != GTE) + return c; + + DPRINTF (( message ("inequalitySubstituteStrong examining substituting for %q with %q", + constraint_print(c), constraintList_print(p) ) )); + constraintList_elements (p, el) + { + DPRINTF (( message ("inequalitySubstituteStrong examining substituting %s on %s", constraint_print(el), constraint_print(c) ) )); + + if ( (el->ar == LT ) || (el->ar == LTE ) ) + // if (!constraint_conflict (c, el) ) + { + //constraint temp; + constraintExpr temp2; + + /*@i22*/ + + //temp = constraint_copy(el); + + // temp = constraint_adjust(temp, c); + + if (constraintExpr_same (el->lexpr, c->expr) ) + { + DPRINTF((message ("inequalitySubstitute Replacing %s in %s with %s", + constraintExpr_print (c->expr), + constraint_print (c), + constraintExpr_print (el->expr) ) + )); + temp2 = constraintExpr_copy (el->expr); + constraintExpr_free(c->expr); + if ( (el->ar == LTE ) ) + { + c->expr = temp2; + } + else + { + c->expr = constraintExpr_makeIncConstraintExpr (temp2); + } + } + + } + } + end_constraintList_elements; + + c = constraint_simplify(c); + 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. @@ -1029,7 +1138,7 @@ 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; @@ -1087,9 +1196,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,7 +1206,7 @@ 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) ) ) ); c->expr = constraintExpr_solveBinaryExpr (c->lexpr, c->expr); @@ -1141,6 +1250,16 @@ static constraint constraint_swapLeftRight (/*@returned@*/ constraint c) constraint constraint_simplify ( /*@returned@*/ constraint c) { + + DPRINTF(( message("constraint_simplify on %q ", constraint_print(c) ) )); + + if (constraint_tooDeep(c)) + { + DPRINTF(( message("constraint_simplify: constraint to complex aborting %q ", constraint_print(c) ) )); + return c; + + } + c->lexpr = constraintExpr_simplify (c->lexpr); c->expr = constraintExpr_simplify (c->expr); @@ -1158,6 +1277,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_print(c) ) )); + return c; }