Make sure that actions that do writes are labeled correctly in predicate trees

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 9ba69d387841683b478699469f8d64050ce120a6..5cc0219c4b14e36033953d9d1bc37b8773f583ef 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -3,12 +3,21 @@
 Predicate::Predicate(FuncInst * func_inst, bool is_entry) :
        func_inst(func_inst),
        entry_predicate(is_entry),
-       pred_expressions(),
+       does_write(false),
+       pred_expressions(16),
        children(),
        parent(NULL),
-       backedge(NULL)
+       backedges(16)
 {}
 
+Predicate::~Predicate()
+{
+       // parent and func_inst should not be deleted
+       pred_expressions.reset();
+       backedges.reset();
+       children.clear();
+}
+
 unsigned int pred_expr_hash(struct pred_expr * expr)
 {
         return (unsigned int)((uintptr_t)expr);
@@ -62,12 +71,14 @@ void Predicate::print_predicate()
        PredExprSetIter * it = pred_expressions.iterator();
 
        if (pred_expressions.getSize() == 0)
-               model_print("no predicate\n");
+               model_print("predicate unset\n");
 
        while (it->hasNext()) {
                struct pred_expr * expr = it->next();
                FuncInst * inst = expr->func_inst;
                switch (expr->token) {
+                       case NOPREDICATE:
+                               break;
                        case EQUALITY:
                                model_print("predicate token: equality, position: %s, value: %d\n", inst->get_position(), expr->value);
                                break;
@@ -79,6 +90,10 @@ void Predicate::print_predicate()
                                break;
                }
        }
+
+       if (does_write) {
+               model_print("Does write\n");
+       }
        model_print("\"];\n");
 }
 
@@ -91,6 +106,9 @@ void Predicate::print_pred_subtree()
                model_print("\"%p\" -> \"%p\"\n", this, child);
        }
 
-       if (backedge != NULL)
+       PredSetIter * it = backedges.iterator();
+       while (it->hasNext()) {
+               Predicate * backedge = it->next();
                model_print("\"%p\" -> \"%p\"[style=dashed, color=grey]\n", this, backedge);
+       }
 }