Fix bug

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 732e39abd8b7644d5f5d9d37df1e9a133594b06e..6a35fcc406f207e6c1daefe3a3992cdf34ab6e76 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -1,40 +1,18 @@
-#ifndef __PREDICTAE_H__
+#ifndef __PREDICATE_H__
 #define __PREDICATE_H__
 
-#include "funcinst.h"
 #include "hashset.h"
+#include "predicatetypes.h"
+#include "classlist.h"
 
 unsigned int pred_expr_hash (struct pred_expr *);
 bool pred_expr_equal(struct pred_expr *, struct pred_expr *);
 typedef HashSet<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredExprSet;
 typedef HSIterator<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredExprSetIter;
 
-typedef enum predicate_token {
-       NOPREDICATE, EQUALITY, NULLITY
-} token_t;
-
-/* If token is EQUALITY, then the predicate asserts whether
- * this load should read the same value as the last value
- * read at memory location specified in predicate_expr.
- */
-struct pred_expr {
-       pred_expr(token_t token, FuncInst * inst, bool value) :
-               token(token),
-               func_inst(inst),
-               value(value)
-       {}
-
-       token_t token;
-       FuncInst * func_inst;
-       bool value;
-
-       MEMALLOC
-};
-
-
 class Predicate {
 public:
-       Predicate(FuncInst * func_inst, bool is_entry = false);
+       Predicate(FuncInst * func_inst, bool is_entry = false, bool is_exit = false);
        ~Predicate();
 
        FuncInst * get_func_inst() { return func_inst; }
@@ -43,16 +21,29 @@ public:
        void add_predicate_expr(token_t token, FuncInst * func_inst, bool value);
        void add_child(Predicate * child);
        void set_parent(Predicate * parent_pred) { parent = parent_pred; }
+       void set_exit(Predicate * exit_pred) { exit = exit_pred; }
        void add_backedge(Predicate * back_pred) { backedges.add(back_pred); }
        void copy_predicate_expr(Predicate * other);
 
        ModelVector<Predicate *> * get_children() { return &children; }
        Predicate * get_parent() { return parent; }
+       Predicate * get_exit() { return exit; }
        PredSet * get_backedges() { return &backedges; }
 
        bool is_entry_predicate() { return entry_predicate; }
        void set_entry_predicate() { entry_predicate = true; }
 
+       /* Whether func_inst does write or not */
+       bool is_write() { return does_write; }
+       void set_write(bool is_write) { does_write = is_write; }
+
+       ConcretePredicate * evaluate(inst_act_map_t * inst_act_map, thread_id_t tid);
+
+       uint32_t get_expl_count() { return exploration_count; }
+       uint32_t get_fail_count() { return failure_count; }
+       void incr_expl_count() { exploration_count++; }
+       void incr_fail_count() { failure_count++; }
+
        void print_predicate();
        void print_pred_subtree();
 
@@ -60,15 +51,20 @@ public:
 private:
        FuncInst * func_inst;
        bool entry_predicate;
+       bool exit_predicate;
+       bool does_write;
+       uint32_t exploration_count;
+       uint32_t failure_count;
 
-       /* may have multiple predicate expressions */
+       /* May have multiple predicate expressions */
        PredExprSet pred_expressions;
        ModelVector<Predicate *> children;
 
-       /* only a single parent may exist */
+       /* Only a single parent may exist */
        Predicate * parent;
+       Predicate * exit;
 
-       /* may have multiple back edges, e.g. nested loops */
+       /* May have multiple back edges, e.g. nested loops */
        PredSet backedges;
 };