small changes

[c11tester.git] / predicate.cc

diff --git a/predicate.cc b/predicate.cc
index e87c695bedadccfd908c31aa4524c56082833142..9b8060aa777b51554e1d841d9841672cb6b2593d 100644 (file)
--- a/predicate.cc
+++ b/predicate.cc
@@ -8,7 +8,7 @@ Predicate::Predicate(FuncInst * func_inst, bool is_entry, bool is_exit) :
        exit_predicate(is_exit),
        does_write(false),
        depth(0),
-       weight(0),
+       weight(100),
        exploration_count(0),
        store_visible_count(0),
        total_checking_count(0),
@@ -80,56 +80,42 @@ void Predicate::copy_predicate_expr(Predicate * other)
        delete it;
 }
 
-/* Follow the child if any child whose FuncInst matches with inst
- *
- * @param inst must be an ATOMIC_WRITE FuncInst
- * @return NULL if no such child is found.
- */
-Predicate * Predicate::follow_write_child(FuncInst * inst)
-{
-       ASSERT(inst->get_type() == ATOMIC_WRITE);
-
-       for (uint i = 0; i < children.size(); i++) {
-               Predicate * child = children[i];
-               if (child->get_func_inst() == inst)
-                       return child;
-       }
-
-       return NULL;
-}
-
 /* Evaluate predicate expressions against the given inst_act_map */
-ConcretePredicate * Predicate::evaluate(inst_act_map_t * inst_act_map, thread_id_t tid)
+ConcretePredicate * Predicate::evaluate(thread_id_t tid)
 {
-       ConcretePredicate * concrete = new ConcretePredicate(tid);
-       PredExprSetIter * it = pred_expressions.iterator();
+       /*
+          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);
+          }
+
+          delete it;
+          return concrete;
+        */
 
-       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);
-       }
-
-       delete it;
-       return concrete;
+       return NULL;
 }
 
 void Predicate::print_predicate()