X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=predicate.cc;h=c8e3989133fddedb009a8bc8544dfe48d893fdb4;hp=c7915006f7d01f96dfa8b355544e3e17cfca5230;hb=39e9009d50498d0dd1bccc1a54e378f7aef5a28a;hpb=ec7cf0eb61ee239b3da1f184a9e43f77b0dcc25d

diff --git a/predicate.cc b/predicate.cc
index c7915006..c8e39891 100644
--- a/predicate.cc
+++ b/predicate.cc
@@ -1,26 +1,101 @@
 #include "predicate.h"
 
-inline bool operator==(const predicate_expr& expr_A, const predicate_expr& expr_B)
+Predicate::Predicate(FuncInst * func_inst, bool is_entry) :
+	func_inst(func_inst),
+	entry_predicate(is_entry),
+	pred_expressions(16),
+	children(),
+	parent(NULL),
+	backedges(16)
+{}
+
+unsigned int pred_expr_hash(struct pred_expr * expr)
 {
-	if (expr_A.token != expr_B.token)
-		return false;
+        return (unsigned int)((uintptr_t)expr);
+}
 
-	if (expr_A.token == EQUALITY && expr_A.location != expr_B.location)
+bool pred_expr_equal(struct pred_expr * p1, struct pred_expr * p2)
+{
+	if (p1->token != p2->token)
 		return false;
-
-	if (expr_A.value != expr_B.value)
+	if (p1->token == EQUALITY && p1->func_inst != p2->func_inst)
+		return false;
+	if (p1->value != p2->value)
 		return false;
-
 	return true;
 }
 
-void Predicate::add_predicate(predicate_expr predicate)
+void Predicate::add_predicate_expr(token_t token, FuncInst * func_inst, bool value)
+{
+	struct pred_expr *ptr = new pred_expr(token, func_inst, value);
+	pred_expressions.add(ptr);
+}
+
+void Predicate::add_child(Predicate * child)
+{
+	/* check duplication? */
+	children.push_back(child);
+}
+
+void Predicate::copy_predicate_expr(Predicate * other)
+{
+	PredExprSet * other_pred_expressions = other->get_pred_expressions();
+	PredExprSetIter * it = other_pred_expressions->iterator();
+
+	while (it->hasNext()) {
+		struct pred_expr * ptr = it->next();
+		struct pred_expr * copy = new pred_expr(ptr->token, ptr->func_inst, ptr->value);
+		pred_expressions.add(copy);
+	}
+}
+
+void Predicate::print_predicate()
+{
+	model_print("\"%p\" [shape=box, label=\"\n", this);
+	if (entry_predicate) {
+		model_print("entry node\"];\n");
+		return;
+	}
+
+	func_inst->print();
+
+	PredExprSetIter * it = pred_expressions.iterator();
+
+	if (pred_expressions.getSize() == 0)
+		model_print("predicate unset\n");
+
+	while (it->hasNext()) {
+		struct pred_expr * expr = it->next();
+		FuncInst * inst = expr->func_inst;
+		switch (expr->token) {
+			case NOPREDICATE:
+				break;
+			case EQUALITY:
+				model_print("predicate token: equality, position: %s, value: %d\n", inst->get_position(), expr->value);
+				break;
+			case NULLITY:
+				model_print("predicate token: nullity, value: %d\n", expr->value);
+				break;
+			default:
+				model_print("unknown predicate token\n");
+				break;
+		}
+	}
+	model_print("\"];\n");
+}
+
+void Predicate::print_pred_subtree()
 {
-	ModelList<predicate_expr>::iterator it;
-	for (it = predicates.begin();it != predicates.end();it++) {
-		if (predicate == *it)
-			return;
+	print_predicate();
+	for (uint i = 0; i < children.size(); i++) {
+		Predicate * child = children[i];
+		child->print_pred_subtree();
+		model_print("\"%p\" -> \"%p\"\n", this, child);
 	}
 
-	predicates.push_back(predicate);
+	PredSetIter * it = backedges.iterator();
+	while (it->hasNext()) {
+		Predicate * backedge = it->next();
+		model_print("\"%p\" -> \"%p\"[style=dashed, color=grey]\n", this, backedge);
+	}
 }