Fix bug

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index 5695452853f93cbc5c887c25acdff6c9e63fc4cd..4094b615514b48deee3caa34c98c73f6ebba4902 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,20 +1,24 @@
+#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)
 {}
 
 Predicate::~Predicate()
 {
-//     if (func_inst)
-//             delete func_inst;
-
-       // parent should not be deleted
+       // parent and func_inst should not be deleted
        pred_expressions.reset();
        backedges.reset();
        children.clear();
@@ -60,6 +64,39 @@ void Predicate::copy_predicate_expr(Predicate * other)
        }
 }
 
+/* Evaluate predicate expressions against the given inst_act_map */
+ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id_t tid)
+{
+       ConcretePredicate * concrete = new ConcretePredicate(tid);
+       PredExprSetIter * it = pred_expressions.iterator();
+
+       while (it->hasNext()) {
+               struct pred_expr * ptr = it->next();
+               uint64_t value = 0;
+
+               switch(ptr->token) {
+                       case NOPREDICATE:
+                               break;
+                       case EQUALITY:
+                               FuncInst * to_be_compared;
+                               ModelAction * last_act;
+
+                               to_be_compared = ptr->func_inst;
+                               last_act = inst_act_map->get(to_be_compared);
+                               value = last_act->get_reads_from_value();
+                               break;
+                       case NULLITY:
+                               break;
+                       default:
+                               break;
+               }
+
+               concrete->add_expression(ptr->token, value, ptr->value);
+       }
+
+       return concrete;
+}
+
 void Predicate::print_predicate()
 {
        model_print("\"%p\" [shape=box, label=\"\n", this);
@@ -68,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();
@@ -92,6 +134,11 @@ void Predicate::print_predicate()
                                break;
                }
        }
+
+       if (does_write) {
+               model_print("Does write\n");
+       }
+       model_print("Count: %d\n", exploration_count);
        model_print("\"];\n");
 }
 
@@ -109,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);
+       }
 }