Build without warnings

[satcheck.git] / eprecord.cc

diff --git a/eprecord.cc b/eprecord.cc
index c7bf25f..30ece3b 100644 (file)
--- a/eprecord.cc
+++ b/eprecord.cc
@@ -83,6 +83,8 @@ const char * eventToStr(EventType event) {
                return "yield";
        case NONLOCALTRANS:
                return "nonlocal";
                return "yield";
        case NONLOCALTRANS:
                return "nonlocal";

+       case LOOPEXIT:
+               return "loopexit";

        case LABEL:
                return "label";
        case LOOPENTER:
        case LABEL:
                return "label";
        case LOOPENTER:


@@ -115,6 +117,7 @@ IntHashSet * EPRecord::getReturnValueSet() {
        case YIELD:
        case FENCE:
        case NONLOCALTRANS:
        case YIELD:
        case FENCE:
        case NONLOCALTRANS:

+       case LOOPEXIT:

        case LABEL:
        case LOOPENTER:
        case LOOPSTART:
        case LABEL:
        case LOOPENTER:
        case LOOPSTART:


@@ -129,13 +132,13 @@ IntHashSet * EPRecord::getReturnValueSet() {
 void EPRecord::print(int f) {
        if (event==RMW) {
                if (op==ADD)
 void EPRecord::print(int f) {
        if (event==RMW) {
                if (op==ADD)

-                       dprintf(f, "add");
+                       model_dprintf(f, "add");

                else if (op==EXC)
                else if (op==EXC)

-                       dprintf(f, "exc");
+                       model_dprintf(f, "exc");

                else
                else

-                       dprintf(f, "cas");
+                       model_dprintf(f, "cas");

        } else
        } else

-               dprintf(f, "%s",eventToStr(event));
+               model_dprintf(f, "%s",eventToStr(event));

        IntHashSet *i=NULL;
        switch(event) {
        case LOAD:
        IntHashSet *i=NULL;
        switch(event) {
        case LOAD:


@@ -150,14 +153,14 @@ void EPRecord::print(int f) {
        case FUNCTION: {
                if (!getPhi()) {
                        CGoalIterator *cit=completed->iterator();
        case FUNCTION: {
                if (!getPhi()) {
                        CGoalIterator *cit=completed->iterator();

-                       dprintf(f, "{");
+                       model_dprintf(f, "{");

                        while(cit->hasNext()) {
                                CGoal *goal=cit->next();
                        while(cit->hasNext()) {
                                CGoal *goal=cit->next();

-                               dprintf(f,"(");
+                               model_dprintf(f,"(");

                                for(uint i=0;i<getNumFuncInputs();i++) {
                                for(uint i=0;i<getNumFuncInputs();i++) {

-                                       dprintf(f,"%lu ", goal->getValue(i+VC_BASEINDEX));
+                                       model_dprintf(f,"%llu ", goal->getValue(i+VC_BASEINDEX));

                                }
                                }

-                               dprintf(f,"=> %lu)", goal->getOutput());
+                               model_dprintf(f,"=> %llu)", goal->getOutput());

                        }
                        delete cit;
                }
                        }
                        delete cit;
                }


@@ -168,28 +171,27 @@ void EPRecord::print(int f) {
        }
        if (i!=NULL) {
                IntIterator *it=i->iterator();
        }
        if (i!=NULL) {
                IntIterator *it=i->iterator();

-               dprintf(f, "{");
+               model_dprintf(f, "{");

 
                while(it->hasNext()) {
 
                while(it->hasNext()) {

-                       dprintf(f, "%lu ", it->next());
+                       model_dprintf(f, "%llu ", it->next());

                }
                }

-               dprintf(f, "}");
+               model_dprintf(f, "}");

                delete it;
        }
 
        for(uint i=0;i<numinputs;i++) {
                IntIterator *it=setarray[i]->iterator();
                delete it;
        }
 
        for(uint i=0;i<numinputs;i++) {
                IntIterator *it=setarray[i]->iterator();

-               dprintf(f,"{");
+               model_dprintf(f,"{");

                while(it->hasNext()) {
                        uint64_t v=it->next();
                while(it->hasNext()) {
                        uint64_t v=it->next();

-                       dprintf(f,"%lu ", v);
+                       model_dprintf(f,"%llu ", v);

                }
                }

-               dprintf(f,"}");
+               model_dprintf(f,"}");

                delete it;
        }
                delete it;
        }

-       dprintf(f, "}");

 
 

-       
+

        execpoint->print(f);
 }
 
        execpoint->print(f);
 }