change the way to detect loops

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 4458e8b9733c8954db417a7944daa2cc0c50620c..c8e3989133fddedb009a8bc8544dfe48d893fdb4 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,9 +1,12 @@
 #include "predicate.h"
 
-Predicate::Predicate(FuncInst * func_inst) :
+Predicate::Predicate(FuncInst * func_inst, bool is_entry) :
        func_inst(func_inst),
-       predicates(),
-       children()
+       entry_predicate(is_entry),
+       pred_expressions(16),
+       children(),
+       parent(NULL),
+       backedges(16)
 {}
 
 unsigned int pred_expr_hash(struct pred_expr * expr)
@@ -15,17 +18,17 @@ 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);
-       predicates.add(ptr);
+       struct pred_expr *ptr = new pred_expr(token, func_inst, value);
+       pred_expressions.add(ptr);
 }
 
 void Predicate::add_child(Predicate * child)
@@ -34,19 +37,51 @@ void Predicate::add_child(Predicate * child)
        children.push_back(child);
 }
 
+void Predicate::copy_predicate_expr(Predicate * other)
+{
+       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()
 {
-       //model_print("self: %p ", this);
+       model_print("\"%p\" [shape=box, label=\"\n", this);
+       if (entry_predicate) {
+               model_print("entry node\"];\n");
+               return;
+       }
+
        func_inst->print();
-       PredSetIter * it = predicates.iterator();
 
-       if (predicates.getSize() == 0)
-               model_print("no predicate\n");
+       PredExprSetIter * it = pred_expressions.iterator();
+
+       if (pred_expressions.getSize() == 0)
+               model_print("predicate unset\n");
 
        while (it->hasNext()) {
                struct pred_expr * expr = it->next();
-               model_print("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;
+               }
        }
+       model_print("\"];\n");
 }
 
 void Predicate::print_pred_subtree()
@@ -54,7 +89,13 @@ void Predicate::print_pred_subtree()
        print_predicate();
        for (uint i = 0; i < children.size(); i++) {
                Predicate * child = children[i];
-//             model_print("parent: %p - ", this);
                child->print_pred_subtree();
+               model_print("\"%p\" -> \"%p\"\n", this, child);
+       }
+
+       PredSetIter * it = backedges.iterator();
+       while (it->hasNext()) {
+               Predicate * backedge = it->next();
+               model_print("\"%p\" -> \"%p\"[style=dashed, color=grey]\n", this, backedge);
        }
 }