+/*
+** 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 <ctype.h> /* for isdigit */
-# include "lclintMacros.nf"
+# include "splintMacros.nf"
# include "basic.h"
# include "cgrammar.h"
# include "cgrammar_tokens.h"
# include "exprNodeSList.h"
-/*@access constraint, exprNode @*/
-
+/*@access constraint, exprNode @*/ /*!!! NO! Don't do this so recklessly - design your code more carefully so you don't need to! */
static constraint inequalitySubstitute (/*@returned@*/ constraint p_c, constraintList p_p);
static constraint inequalitySubstituteUnsound (/*@returned@*/ constraint p_c, constraintList p_p);
+static constraint inequalitySubstituteStrong (/*@returned@*/ constraint p_c, constraintList p_p);
+
static constraint constraint_searchandreplace (/*@returned@*/ constraint p_c, constraintExpr p_old, constraintExpr p_newExpr);
static /*@only@*/ constraintList reflectChangesEnsuresFree1 (/*@only@*/ constraintList p_pre2, constraintList p_post1);
-/*********************************************/
-
-
-
/*@only@*/ constraintList constraintList_mergeEnsuresFreeFirst (constraintList list1, constraintList list2)
{
constraintList ret;
constraintList temp;
- //ret = constraintList_makeNew();
-
llassert(constraintList_isDefined(list1) );
llassert(constraintList_isDefined(list2) );
return temp;
- //ret = constraintList_addList (ret, list2);
- //return ret;
}
DPRINTF((message ("constraintList_mergeRequires: merging %s and %s ", constraintList_print (list1), constraintList_print(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 = constraintList_reflectChanges(list1, list2);
DPRINTF((message ("constraintList_mergeRequires: temp = %s", constraintList_print(temp) ) ) );
{
constraintList temp, temp2;
- DPRINTF( (message ("magically merging constraint into parent:%s for", exprNode_unparse (parent) )) );
+ DPRINTF((message ("magically merging constraint into parent:%s for", exprNode_unparse (parent) )) );
- DPRINTF( (message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2) ) ) );
+ DPRINTF((message (" children: %s and %s", exprNode_unparse (child1), exprNode_unparse(child2) ) ) );
+
+ if (exprNode_isUndefined(parent) )
+ {
+ llassert (exprNode_isDefined(parent) );
+ return;
+ }
+
+
if (exprNode_isError (child1) || exprNode_isError(child2) )
{
if (exprNode_isError (child1) && !exprNode_isError(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",
+ DPRINTF((message ("Child constraints are %s %s and %s %s",
constraintList_print (child1->requiresConstraints),
constraintList_print (child1->ensuresConstraints),
constraintList_print (child2->requiresConstraints),
parent->requiresConstraints = temp2;
- DPRINTF( (message ("Parent requires constraints are %s ",
+ DPRINTF((message ("Parent requires constraints are %s ",
constraintList_print (parent->requiresConstraints)
) ) );
child2->ensuresConstraints);
- DPRINTF( (message ("Parent constraints are %s and %s ",
+ DPRINTF((message ("Parent constraints are %s and %s ",
constraintList_print (parent->requiresConstraints),
constraintList_print (parent->ensuresConstraints)
) ) );
}
else
{
- DPRINTF ( (message ("Subsuming %s", constraint_print (el) ) ) );
+ DPRINTF ((message ("Subsuming %s", constraint_print (el) ) ) );
}
} end_constraintList_elements;
}
+
/* tries to resolve constraints in list pre2 using post1 */
-/*@only@*/ constraintList 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) )));
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 (!constraintList_resolve (temp2, post1) )
{
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 orConstr)
{
constraint c;
+
+ llassert(constraint_isDefined(orig) );
+
c = orig;
DPRINTF((message("constraint_addor: oring %s onto %s", constraint_printOr(orConstr), constraint_printOr(orig) ) ));
{
c = c->or;
}
+
c->or = constraint_copy(orConstr);
DPRINTF((message("constraint_addor: returning %s",constraint_printOr(orig) ) ));
{
constraint temp;
+ int numberOr;
+
+ numberOr = 0;
+
+ llassert(constraint_isDefined(c) );
+
DPRINTF(( message("resolveOr: constraint %s and list %s", constraint_printOr(c), constraintList_print(list) ) ));
+
temp = c;
do
if (constraintList_resolve (temp, list) )
return TRUE;
temp = temp->or;
+ numberOr++;
+ llassert(numberOr <= 10);
}
while (constraint_isDefined(temp));
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_printOr(c), constraintList_print(post1)
+ )
+ ));
- if (!resolveOr (c, post1) )
+ if (!resolveOr (c, post1) )
+ {
+
+ temp = constraint_substitute (c, post1);
+
+ DPRINTF((message("doResolve:: after substitute temp is %q",
+ constraint_printOr(temp)
+ )
+ ));
+
+ if (!resolveOr (temp, post1) )
{
-
- temp = constraint_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_printOr(tempSub)
+ )
+ ));
+
+ DPRINTF((
+ message("doResolve: not adding %s ",
+ constraint_printOr(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_printOr(tempSub)
+ )
+ ));
+
+
+ DPRINTF((
+ message("doResolve: not adding %s ",
+ constraint_printOr(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_printOr(c), constraintList_print(post1) ) ));
+
+
- *resolved = FALSE;
+ *resolved = FALSE;
+
+ llassert(constraint_isDefined(c) );
+
ret = constraint_copy(c);
+
+ llassert(constraint_isDefined(ret) );
+
+ if (constraintList_isEmpty(post1) )
+ {
+ return ret;
+ }
+
next = ret->or;
ret->or = NULL;
{
if (next != NULL)
constraint_free(next);
-
+
/*we don't need to free ret when resolved is false because ret is null*/
llassert(ret == NULL);
- return NULL;
+ return NULL;
}
-
+
while (next != NULL)
{
curr = next;
curr->or = NULL;
curr = doResolve (curr, post1, resolved);
- if (*resolved)
+
+ if (*resolved)
{
/* curr is null so we don't try to free it*/
llassert(curr == NULL);
ret = constraint_addOr (ret, curr);
constraint_free(curr);
}
-
return ret;
}
-
-
-
-
/* tries to resolve constraints in list pr2 using post1 */
/*@only@*/ constraintList constraintList_reflectChangesOr (constraintList pre2, constraintList post1)
{
}
else
{
- /*we don't need to free ret when resolved is false because ret is null*/
+ /* we don't need to free temp when
+ resolved is false because temp is null */
llassert(temp == NULL);
}
} end_constraintList_elements;
- DPRINTF((message ("constraintList_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;
}
else
{
- DPRINTF ( (message ("Resolved away %s ", constraint_print(el) ) ) );
+ DPRINTF ((message ("Resolved away %s ", constraint_print(el) ) ) );
}
} end_constraintList_elements;
static bool constraint_conflict (constraint c1, constraint c2)
{
-
+
+ llassert(constraint_isDefined(c1) );
+ llassert(constraint_isDefined(c2) );
+
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 ((message ("%s conflicts with %s ", constraint_print (c1), constraint_print(c2) ) ) );
return TRUE;
}
}
- DPRINTF ( (message ("%s doesn't conflict with %s ", constraint_print (c1), constraint_print(c2) ) ) );
+ /* This is a slight kludg 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_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 (/*@temp@*/ constraint good, /*@temp@*/ /*@observer@*/ constraint conflicting) /*@modifies good@*/
{
+ llassert(constraint_isDefined(conflicting) );
+
if (conflicting->ar ==EQ )
{
+ llassert(constraint_isDefined(good) );
good->expr = constraintExpr_searchandreplace (good->expr, conflicting->lexpr, conflicting->expr);
good = constraint_simplify (good);
}
}
-//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;
/*returns true if constraint post satifies cosntriant pre */
static bool satifies (constraint pre, constraint post)
{
+ llassert(constraint_isDefined(pre) );
+ llassert(constraint_isDefined(post) );
+
if (constraint_isAlwaysTrue (pre) )
return TRUE;
{
if ( satifies (c, el) )
{
- DPRINTF ( (message ("\n%s Satifies %s\n ", constraint_print(el), constraint_print(c) ) ) );
+ DPRINTF ((message ("\n%s Satifies %s\n ", constraint_print(el), constraint_print(c) ) ) );
return TRUE;
}
- DPRINTF ( (message ("\n%s does not satify %s\n ", constraint_print(el), constraint_print(c) ) ) );
+ DPRINTF ((message ("\n%s does not satify %s\n ", constraint_print(el), constraint_print(c) ) ) );
}
end_constraintList_elements;
- DPRINTF ( (message ("no constraints satify %s", constraint_print(c) ) ));
+ DPRINTF ((message ("no constraints satify %s", constraint_print(c) ) ));
return FALSE;
}
{
case GTE:
case GT:
- if ( (ar2 == GT) || (ar2 == GTE) || (ar2 == EQ) )
+ if ((ar2 == GT) || (ar2 == GTE) || (ar2 == EQ) )
{
return TRUE;
}
case LT:
case LTE:
- // llassert(FALSE);
- if ( (ar2 == LT) || (ar2 == LTE) || (ar2 == EQ) )
+ if ((ar2 == LT) || (ar2 == LTE) || (ar2 == EQ) )
return TRUE;
break;
default:
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;
+
+ llassert(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_print(c) )
+ ));
+
+ llassert (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@*/ /*@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) ) ));
-
+
+ if (sizeOfMaxSet(c) )
+ return TRUE;
+
if (constraintExpr_canGetValue(l) && constraintExpr_canGetValue(r) )
{
int cmp;
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 ) )
return TRUE;
}
}
- DPRINTF( ("Can't Get value"));
+ DPRINTF(("Can't Get value"));
constraintExpr_free(e1);
constraintExpr_free(e2);
constraintExpr_free(e1);
constraintExpr_free(e2);
- DPRINTF( ("Can't Get value"));
+ DPRINTF(("Can't Get value"));
return FALSE;
}
static constraint constraint_searchandreplace (/*@returned@*/ constraint c, constraintExpr old, constraintExpr newExpr)
{
+ llassert (constraint_isDefined(c) );
+
DPRINTF (("Doing replace for lexpr") );
+
c->lexpr = constraintExpr_searchandreplace (c->lexpr, old, newExpr);
DPRINTF (("Doing replace for expr") );
c->expr = constraintExpr_searchandreplace (c->expr, old, newExpr);
{
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),
+ DPRINTF ((message("Start adjust on %s and %s", constraint_print(substitute),
constraint_print(old))
));
+ llassert(constraint_isDefined(substitute));
+ llassert(constraint_isDefined(old));
+
loc1 = constraint_getFileloc (old);
-
loc2 = constraintExpr_getFileloc (substitute->lexpr);
-
loc3 = constraintExpr_getFileloc (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_print(substitute) )
));
temp = substitute->lexpr;
substitute->lexpr = substitute->expr;
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_print (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_print(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_print(c), constraintList_print(p) ) ));
+ constraintList_elements (p, el)
+ {
+
+ DPRINTF (( message ("inequalitySubstituteStrong examining substituting %s on %s", constraint_print(el), constraint_print(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),
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);
+ }
}
}
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.
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_print(el), constraint_print(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)
ret = constraint_copy(c);
constraintList_elements (p, el)
{
+ llassert(constraint_isDefined(el) );
if ( el->ar == EQ)
if (!constraint_conflict (ret, el) )
temp = constraint_adjust(temp, ret);
- DPRINTF((message ("Substituting %s in the constraint %s",
- constraint_print (temp), constraint_print (ret)
+ llassert(constraint_isDefined(temp) );
+
+
+ DPRINTF((message ("constraint_substitute :: Substituting in %s using %s",
+ constraint_print (ret), constraint_print (temp)
) ) );
ret = constraint_searchandreplace (ret, temp->lexpr, temp->expr);
- DPRINTF(( message ("The new constraint is %s", constraint_print (ret) ) ));
+ DPRINTF(( message (" constraint_substitute :: The new constraint is %s", constraint_print (ret) ) ));
constraint_free(temp);
}
}
end_constraintList_elements;
- DPRINTF(( message ("The finial new constraint is %s", constraint_print (ret) ) ));
ret = constraint_simplify(ret);
+
+ DPRINTF(( message (" constraint_substitute :: The final new constraint is %s", constraint_print (ret) ) ));
+
return ret;
}
constraintList_elements(target, el)
{
constraint temp;
- //drl possible problem : warning make sure that a side effect is not expected
+ /* drl possible problem : warning make sure that a side effect is not expected */
temp = constraint_substitute(el, subList);
ret = constraintList_add (ret, temp);
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_print(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_print(c) ) ) );
return c;
}
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;
constraint constraint_simplify ( /*@returned@*/ constraint c)
{
+
+ llassert(constraint_isDefined(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);
/*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;
}
andersk / splint.git / blobdiff