Fix bug

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 94eedfd52253382a46e659488346bd596fa397dd..4094b615514b48deee3caa34c98c73f6ebba4902 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,13 +1,18 @@
+#include "funcinst.h"
 #include "predicate.h"
 #include "concretepredicate.h"
 
-Predicate::Predicate(FuncInst * func_inst, bool is_entry) :
+Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
        func_inst(func_inst),
        entry_predicate(is_entry),
+       exit_predicate(is_exit),
        does_write(false),
+       exploration_count(0),
+       failure_count(0),
        pred_expressions(16),
        children(),
        parent(NULL),
+       exit(NULL),
        backedges(16)
 {}
 
@@ -92,7 +97,6 @@ ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id
        return concrete;
 }
 
-
 void Predicate::print_predicate()
 {
        model_print("\"%p\" [shape=box, label=\"\n", this);
@@ -101,6 +105,11 @@ void Predicate::print_predicate()
                return;
        }
 
+       if (exit_predicate) {
+               model_print("exit node\"];\n");
+               return;
+       }
+
        func_inst->print();
 
        PredExprSetIter * it = pred_expressions.iterator();
@@ -129,6 +138,7 @@ void Predicate::print_predicate()
        if (does_write) {
                model_print("Does write\n");
        }
+       model_print("Count: %d\n", exploration_count);
        model_print("\"];\n");
 }
 
@@ -146,4 +156,8 @@ void Predicate::print_pred_subtree()
                Predicate * backedge = it->next();
                model_print("\"%p\" -> \"%p\"[style=dashed, color=grey]\n", this, backedge);
        }
+
+       if (exit) {
+               model_print("\"%p\" -> \"%p\"[style=dashed, color=red]\n", this, exit);
+       }
 }