X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=predicate.h;h=732e39abd8b7644d5f5d9d37df1e9a133594b06e;hp=3efd89056261298074eff295c0d246559eb7eb35;hb=d80e8e4cb554d09807e2ec5e9acadd917579f600;hpb=f8a45d8d10f16533c926096c7538b4d9be73240b

diff --git a/predicate.h b/predicate.h
index 3efd8905..732e39ab 100644
--- 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
@@ -43,12 +43,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_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; }
@@ -61,15 +61,15 @@ private:
 	FuncInst * func_inst;
 	bool entry_predicate;
 
-	/* may have multiple predicates */
+	/* may have multiple predicate expressions */
 	PredExprSet pred_expressions;
 	ModelVector<Predicate *> children;
 
 	/* 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__ */