Using a for loop to prune writes that violate modification order is wrong

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 1fd1d94911b2947a9f1fb2eb91d1e527f82339d9..7710705174860433473b7f8d7a995e198d40a212 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -7,6 +7,7 @@ Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
        entry_predicate(is_entry),
        exit_predicate(is_exit),
        does_write(false),
+       depth(0),
        exploration_count(0),
        store_visible_count(0),
        total_checking_count(0),
@@ -53,6 +54,12 @@ void Predicate::add_child(Predicate * child)
        children.push_back(child);
 }
 
+void Predicate::set_parent(Predicate * parent_pred)
+{
+       parent = parent_pred;
+       depth = parent_pred->get_depth() + 1;
+}
+
 void Predicate::copy_predicate_expr(Predicate * other)
 {
        PredExprSet * other_pred_expressions = other->get_pred_expressions();
@@ -65,6 +72,24 @@ void Predicate::copy_predicate_expr(Predicate * other)
        }
 }
 
+/* Return the single child branch of this predicate.
+ * Return NULL if this predicate has no children.
+ */
+Predicate * Predicate::get_single_child(FuncInst * inst)
+{
+       int size = children.size();
+       if (size == 0)
+               return NULL;
+
+       /* Should only have one child */
+       ASSERT(size == 1);
+       Predicate * child = children[0];
+
+       ASSERT(child->get_func_inst() == inst);
+
+       return child;
+}
+
 /* Evaluate predicate expressions against the given inst_act_map */
 ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id_t tid)
 {
@@ -100,7 +125,7 @@ ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id
 
 void Predicate::print_predicate()
 {
-       model_print("\"%p\" [shape=box, label=\"\n", this);
+       model_print("\"%p\" [shape=box, label=\"", this);
        if (entry_predicate) {
                model_print("entry node\"];\n");
                return;
@@ -111,6 +136,8 @@ void Predicate::print_predicate()
                return;
        }
 
+       model_print("depth: %d\n", depth);
+
        func_inst->print();
 
        if (pred_expressions.getSize() == 0)