Using a for loop to prune writes that violate modification order is wrong

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 2fdd6c591d2f19b4074f641bd0b627280a8ef16d..97e495de8a1024c6fe2d8e44dff7d93bbaa54d3a 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -5,6 +5,8 @@
 #include "predicatetypes.h"
 #include "classlist.h"
 
+#define MAX_DEPTH 0x7fffffff
+
 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;
@@ -20,11 +22,12 @@ 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_parent(Predicate * 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);
 
+       Predicate * get_single_child(FuncInst * inst);
        ModelVector<Predicate *> * get_children() { return &children; }
        Predicate * get_parent() { return parent; }
        Predicate * get_exit() { return exit; }
@@ -47,6 +50,9 @@ public:
        void incr_store_visible_count() { store_visible_count++; }
        void incr_total_checking_count() { total_checking_count++; }
 
+       uint32_t get_depth() { return depth; }
+       void set_depth(uint32_t depth_) { depth = depth_; }
+
        void print_predicate();
        void print_pred_subtree();
 
@@ -57,6 +63,9 @@ private:
        bool exit_predicate;
        bool does_write;
 
+       /* Height of this predicate node in the predicate tree */
+       uint32_t depth;
+
        uint32_t exploration_count;
        uint32_t store_visible_count;
        uint32_t total_checking_count;  /* The number of times the store visibility is checked */