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 6d0dbc4be4232e4a37e0537bde79894db83fecb5..4243a0d88cc98bc47ece42b96f07839c1bf3fe4c 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -6,11 +6,11 @@
 
 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> PredSet;
-typedef HSIterator<struct pred_expr *, uintptr_t, 0, model_malloc, model_calloc, model_free, pred_expr_hash, pred_expr_equal> PredSetIter;
+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 {
-       EQUALITY, NULLITY
+       NOPREDICATE, EQUALITY, NULLITY
 } token_t;
 
 /* If token is EQUALITY, then the predicate asserts whether
@@ -18,29 +18,57 @@ typedef enum predicate_token {
  * read at memory location specified in predicate_expr.
  */
 struct pred_expr {
-       pred_expr(token_t token, void * location, bool value) :
+       pred_expr(token_t token, FuncInst * inst, bool value) :
                token(token),
-               location(location),
+               func_inst(inst),
                value(value)
        {}
 
        token_t token;
-       void * location;
+       FuncInst * func_inst;
        bool value;
 
        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:
-       Predicate(FuncInst * func_inst);
+       Predicate(FuncInst * func_inst, bool is_entry = false);
        ~Predicate();
 
        FuncInst * get_func_inst() { return func_inst; }
-       PredSet * get_predicates() { return &predicates; }
-       void add_predicate(token_t token, void * location, bool value);
+       PredExprSet * get_pred_expressions() { return &pred_expressions; }
+
+       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 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; }
+       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();
@@ -48,9 +76,18 @@ public:
        MEMALLOC
 private:
        FuncInst * func_inst;
-       /* may have multiple precicates */
-       PredSet predicates;
+       bool entry_predicate;
+       bool does_write;
+
+       /* May have multiple predicate expressions */
+       PredExprSet pred_expressions;
        ModelVector<Predicate *> children;
+
+       /* Only a single parent may exist */
+       Predicate * parent;
+
+       /* May have multiple back edges, e.g. nested loops */
+       PredSet backedges;
 };
 
 #endif /* __PREDICATE_H__ */