fix bug - 'backedge' in predicate.cc uninitialized

[c11tester.git] / predicate.h

diff --git a/predicate.h b/predicate.h
index 6cdce9123a46b49b2c8be987d70a6d264ffedbaf..2f15a126653f724e510c3c7a1fb0145fe781a1cd 100644 (file)
--- a/predicate.h
+++ b/predicate.h
@@ -6,7 +6,8 @@
 
 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> PredicateSet;
+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
@@ -17,27 +18,54 @@ typedef enum predicate_token {
  * read at memory location specified in predicate_expr.
  */
 struct pred_expr {
+       pred_expr(token_t token, void * location, bool value) :
+               token(token),
+               location(location),
+               value(value)
+       {}
+
        token_t token;
        void * location;
        bool value;
+
+       MEMALLOC
 };
 
 
 class Predicate {
 public:
-       Predicate(FuncInst * func_inst);
+       Predicate(FuncInst * func_inst, bool is_entry = false);
        ~Predicate();
 
        FuncInst * get_func_inst() { return func_inst; }
-       PredicateSet * get_predicates() { return &predicates; }
+       PredExprSet * get_pred_expressions() { return &pred_expressions; }
        void add_predicate(token_t token, void * location, bool value);
+       void add_child(Predicate * child);
+       void add_parent(Predicate * parent);
+       void set_backedge(Predicate * back_pred) { backedge = back_pred; }
+
+       ModelVector<Predicate *> * get_children() { return &children; }
+       ModelVector<Predicate *> * get_parents() { return &parents; }
+       Predicate * get_backedge() { return backedge; }
+
+       bool is_entry_predicate() { return entry_predicate; }
+       void set_entry_predicate() { entry_predicate = true; }
+
+       void print_predicate();
+       void print_pred_subtree();
 
        MEMALLOC
 private:
        FuncInst * func_inst;
-       /* may have multiple precicates */
-       PredicateSet predicates;
+       bool entry_predicate;
+
+       /* may have multiple predicates */
+       PredExprSet pred_expressions;
        ModelVector<Predicate *> children;
+       ModelVector<Predicate *> parents;
+
+       /* assume almost one back edge exists */
+       Predicate * backedge;
 };
 
 #endif /* __PREDICATE_H__ */