Fix bit rot of DPRINTF calls.

diff --git a/src/constraint.c b/src/constraint.c
index ac18923a630942e1a9b814252b4a18e16c75e358..99c008b313a1983514ab4f954d27a7c77c0d2637 100644 (file)
--- a/src/constraint.c
+++ b/src/constraint.c
@@ -994,7 +994,7 @@ constraint constraint_preserveOrig (/*@returned@*/ constraint c) /*@modifies c @
 {
   if (constraint_isDefined (c))
     {
-      DPRINTF (("Doing constraint_preserverOrig for %q", constraint_printDetailed (c)));
+      DPRINTF (("Doing constraint_preserverOrig for %q", constraint_printLocation (c)));
       
       if (c->orig == constraint_undefined)
        {

diff --git a/src/constraintGeneration.c b/src/constraintGeneration.c
index 9be223eb0d51bd6c9a83e8fe40c3d8b02b0f2c40..148a2e71f81ffb7d3dd8ce48f92c5b309aaed133 100644 (file)
--- a/src/constraintGeneration.c
+++ b/src/constraintGeneration.c
@@ -849,7 +849,7 @@ void exprNode_multiStatement (/*@dependent@*/ exprNode e)
   constraintList temp;
 
   DPRINTF((message ("exprNode_multistatement Analysising %s %s at", exprNode_unparse(e),
-                   fileloc_unparse(exprNode_getfileloc(e)))));
+                   fileloc_unparse(exprNode_getNextSequencePoint(e)))));
   
   if (exprNode_handleError (e))
     {

diff --git a/src/constraintTerm.c b/src/constraintTerm.c
index 60fe0518203c0436ee6501e5500369bffb97c6b7..44d0487b1073d47e4bcf8b0d2657f0ebc87a8143 100644 (file)
--- a/src/constraintTerm.c
+++ b/src/constraintTerm.c
@@ -467,7 +467,7 @@ bool constraintTerm_probSame (constraintTerm term1, constraintTerm term2)
   llassert (term1 !=NULL && term2 !=NULL);
      
  DPRINTF ((message
-           ("Comparing srefs for %s and  %s ", constraintTerm_print(term1), constraintTerm_print(term2)
+           ("Comparing srefs for %s and  %s ", constraintTerm_getName(term1), constraintTerm_getName(term2)
             )
            )
           );
@@ -527,19 +527,19 @@ bool constraintTerm_similar (constraintTerm term1, constraintTerm term2)
     }
   
   DPRINTF((message
-           ("Comparing srefs for %s and  %s ", constraintTerm_print(term1), constraintTerm_print(term2)
+           ("Comparing srefs for %s and  %s ", constraintTerm_getName(term1), constraintTerm_getName(term2)
             )
            )
           );
   
   if (sRef_similarRelaxed(s1, s2)   || sRef_sameName (s1, s2) )
     {
-      DPRINTF ((message (" %s and %s are same", constraintTerm_print(term1), constraintTerm_print(term2)  )  ));
+      DPRINTF ((message (" %s and %s are same", constraintTerm_getName(term1), constraintTerm_getName(term2)  )  ));
       return TRUE;
     }
   else
     {
-      DPRINTF ((message (" %s and %s are not same", constraintTerm_print(term1), constraintTerm_print(term2)  )  ));
+      DPRINTF ((message (" %s and %s are not same", constraintTerm_getName(term1), constraintTerm_getName(term2)  )  ));
       return FALSE;
     }       
 }

diff --git a/src/loopHeuristics.c b/src/loopHeuristics.c
index adb9510bd535392217c26440bcbd3e9608929b8e..58f6b8348cfb504ec9379ce541beaa249d52cb0e 100644 (file)
--- a/src/loopHeuristics.c
+++ b/src/loopHeuristics.c
@@ -212,7 +212,7 @@ static /*@only@*/ constraintExpr getForTimes (/*@notnull@*/ exprNode forPred, /*
        
        if ( (constraint_isDefined (el ) ) && ( increments (el2, el->lexpr) ) )
          {
-           DPRINTF (( message ("getForTimes: %s increments %s", constraint_print (el2), constraint_print (el) ) ));
+           DPRINTF (( message ("getForTimes: %s increments %s", constraint_printLocation (el2), constraint_printLocation (el) ) ));
            ret =  constraintExpr_copy (el->expr);
            constraintList_free (ltCon);
            constraintList_free (incCon);
@@ -222,7 +222,7 @@ static /*@only@*/ constraintExpr getForTimes (/*@notnull@*/ exprNode forPred, /*
        else
          {
            ;
-           DPRINTF (( message ("getForTimes: %s doesn't increment %s", constraint_print (el2), constraint_print (el) )   ));
+           DPRINTF (( message ("getForTimes: %s doesn't increment %s", constraint_printLocation (el2), constraint_printLocation (el) )   ));
          }
       }
       end_constraintList_elements;
@@ -341,7 +341,7 @@ static constraint  constraint_searchAndAdd (/*@returned@*/ constraint c, /*@obse
  
   llassert (constraint_search (c, find)  );
   DPRINTF (( message ("Doing constraint_searchAndAdd  %s %s %s ",
-                    constraint_print (c), constraintExpr_unparse (find), constraintExpr_unparse (add) ) ) );
+                    constraint_printLocation (c), constraintExpr_unparse (find), constraintExpr_unparse (add) ) ) );
   
   c->lexpr = constraintExpr_searchAndAdd (c->lexpr, find, add);
   c->expr =  constraintExpr_searchAndAdd (c->expr, find, add);
@@ -369,7 +369,7 @@ static constraint  constraint_searchAndAdd (/*@returned@*/ constraint c, /*@obse
          newExpr = constraint_copy (el);
 
          newExpr = constraint_searchAndAdd (newExpr, find, add);
-                 DPRINTF (( (message ("Adding constraint %s ", constraint_print (newExpr)) )  ));
+                 DPRINTF (( (message ("Adding constraint %s ", constraint_printLocation (newExpr)) )  ));
          newConstraints = constraintList_add (newConstraints, newExpr);
        }
 
@@ -391,7 +391,7 @@ static void doAdjust (/*@unused@*/ exprNode e, /*@unused@*/ exprNode forPred, /*
       /* look for var = var + 1 */
       if (constraint_isDefined (el) && incVar (el) )
        {
-         DPRINTF ((message ("Found inc variable constraint : %s", constraint_print (el) )  ));
+         DPRINTF ((message ("Found inc variable constraint : %s", constraint_printLocation (el) )  ));
          forBody->requiresConstraints = constraintList_searchAndAdd (forBody->requiresConstraints, el->lexpr, iterations);
        }
     }