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 77f362dafd9c4f8ea29e465a3c01f5f99ea9172c..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(),
-       parents(),
-       backedge(NULL)
+       parent(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);
@@ -18,16 +27,16 @@ bool pred_expr_equal(struct pred_expr * p1, struct pred_expr * p2)
 {
        if (p1->token != p2->token)
                return false;
-       if (p1->token == EQUALITY && p1->location != p2->location)
+       if (p1->token == EQUALITY && p1->func_inst != p2->func_inst)
                return false;
        if (p1->value != p2->value)
                return false;
        return true;
 }
 
-void Predicate::add_predicate(token_t token, void * location, bool value)
+void Predicate::add_predicate_expr(token_t token, FuncInst * func_inst, bool value)
 {
-       struct pred_expr *ptr = new pred_expr(token, location, value);
+       struct pred_expr *ptr = new pred_expr(token, func_inst, value);
        pred_expressions.add(ptr);
 }
 
@@ -37,10 +46,16 @@ void Predicate::add_child(Predicate * child)
        children.push_back(child);
 }
 
-void Predicate::add_parent(Predicate * parent)
+void Predicate::copy_predicate_expr(Predicate * other)
 {
-       /* check duplication? */
-       parents.push_back(parent);
+       PredExprSet * other_pred_expressions = other->get_pred_expressions();
+       PredExprSetIter * it = other_pred_expressions->iterator();
+
+       while (it->hasNext()) {
+               struct pred_expr * ptr = it->next();
+               struct pred_expr * copy = new pred_expr(ptr->token, ptr->func_inst, ptr->value);
+               pred_expressions.add(copy);
+       }
 }
 
 void Predicate::print_predicate()
@@ -56,11 +71,28 @@ 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();
-               model_print("predicate: token: %d, location: %p, value: %d\n", expr->token, expr->location, expr->value);
+               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;
+                       case NULLITY:
+                               model_print("predicate token: nullity, value: %d\n", expr->value);
+                               break;
+                       default:
+                               model_print("unknown predicate token\n");
+                               break;
+               }
+       }
+
+       if (does_write) {
+               model_print("Does write\n");
        }
        model_print("\"];\n");
 }
@@ -74,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);
+       }
 }