X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=funcinst.cc;h=7f031d17d9060251992e7fd13c423e1abe6a9460;hb=63ef91baad03c3c49a2d999b729ef58f55c80dcf;hp=92890d58ce07b296daa0b7bb1c0c17e717d4bb78;hpb=db26d1e3370a583f8eef79194c87ba9d2ef92530;p=c11tester.git

diff --git a/funcinst.cc b/funcinst.cc
index 92890d58..7f031d17 100644
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,13 +1,14 @@
 #include "funcinst.h"
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
-	collisions()
+	single_location(true)
 {
 	ASSERT(act);
 	ASSERT(func_node);
 	this->position = act->get_position();
 	this->location = act->get_location();
 	this->type = act->get_type();
+	this->order = act->get_mo();
 	this->func_node = func_node;
 }
 
@@ -19,9 +20,9 @@ FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
  */
 bool FuncInst::add_pred(FuncInst * other)
 {
-	func_inst_list_mt::iterator it;
-	for (it = predecessors.begin();it != predecessors.end();it++) {
-		FuncInst * inst = *it;
+	mllnode<FuncInst*> * it;
+	for (it = predecessors.begin();it != NULL;it=it->getNext()) {
+		FuncInst * inst = it->getVal();
 		if (inst == other)
 			return false;
 	}
@@ -32,9 +33,9 @@ bool FuncInst::add_pred(FuncInst * other)
 
 bool FuncInst::add_succ(FuncInst * other)
 {
-	func_inst_list_mt::iterator it;
-	for (it = successors.begin();it != successors.end();it++) {
-		FuncInst * inst = *it;
+	mllnode<FuncInst*>* it;
+	for (it = successors.begin();it != NULL;it=it->getNext()) {
+		FuncInst * inst = it->getVal();
 		if ( inst == other )
 			return false;
 	}
@@ -43,26 +44,35 @@ bool FuncInst::add_succ(FuncInst * other)
 	return true;
 }
 
+/*
 FuncInst * FuncInst::search_in_collision(ModelAction *act)
 {
 	action_type type = act->get_type();
 
-	func_inst_list_mt::iterator it;
-	for (it = collisions.begin();it != collisions.end();it++) {
-		FuncInst * inst = *it;
-		if ( inst->get_type() == type )
+	mllnode<FuncInst*> * it;
+	for (it = collisions.begin(); it != NULL; it = it->getNext()) {
+		FuncInst * inst = it->getVal();
+		if (inst->get_type() == type)
 			return inst;
 	}
 	return NULL;
 }
+*/
 
+/* Note: is_read() is equivalent to ModelAction::is_read() */
 bool FuncInst::is_read() const
 {
-	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS; /* type == ATOMIC_RMW ? */
+	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
 }
 
+/* Note: because of action type conversion in ModelExecution
+ * is_write() <==> pure writes (excluding rmw) */
 bool FuncInst::is_write() const
 {
-        return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
+	return type == ATOMIC_WRITE || type == ATOMIC_RMW || type == ATOMIC_INIT || type == ATOMIC_UNINIT || type == NONATOMIC_WRITE;
 }
 
+void FuncInst::print()
+{
+	model_print("func inst - pos: %s, loc: %p, type: %d,\n", position, location, type);
+}