Make sure that actions that do writes are labeled correctly in predicate trees

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 3efd89056261298074eff295c0d246559eb7eb35..4243a0d88cc98bc47ece42b96f07839c1bf3fe4c 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -10,7 +10,7 @@ typedef HashSet<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, mo
 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 {
-       EQUALITY, NULLITY
+       NOPREDICATE, EQUALITY, NULLITY
 } token_t;
 
 /* If token is EQUALITY, then the predicate asserts whether
@@ -31,6 +31,19 @@ struct pred_expr {
        MEMALLOC
 };
 
+/* Used by predicate generator */
+struct half_pred_expr {
+       half_pred_expr(token_t token, FuncInst * inst) :
+               token(token),
+               func_inst(inst)
+       {}
+
+       token_t token;
+       FuncInst * func_inst;
+
+       SNAPSHOTALLOC
+};
+
 
 class Predicate {
 public:
@@ -43,16 +56,20 @@ 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_backedge(Predicate * back_pred) { backedge = back_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_backedge() { return backedge; }
+       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; }
+
        void print_predicate();
        void print_pred_subtree();
 
@@ -60,16 +77,17 @@ public:
 private:
        FuncInst * func_inst;
        bool entry_predicate;
+       bool does_write;
 
-       /* may have multiple predicates */
+       /* 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;
 
-       /* assume almost one back edge exists */
-       Predicate * backedge;
+       /* May have multiple back edges, e.g. nested loops */
+       PredSet backedges;
 };
 
 #endif /* __PREDICATE_H__ */