X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcinst.cc;h=d4288a1438384aff5520ae96aa36016fe6aa8ec6;hp=7e0446ffec149e9c778345c6ca2790ca48916cec;hb=98d08ddaa7c248c7c968c1158eb691dc029a1f81;hpb=91579dadd25579b9aa7e1dd7a537892c9b1e9311

diff --git a/funcinst.cc b/funcinst.cc
index 7e0446ff..d4288a14 100644
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,13 +1,17 @@
 #include "funcinst.h"
+#include "model.h"
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
-	collisions()
+	single_location(true),
+	execution_number(0),
+	action_marker(0)	/* The marker for FuncNode starts from 1 */
 {
 	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 +23,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 +36,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,20 +47,53 @@ bool FuncInst::add_succ(FuncInst * other)
 	return true;
 }
 
+void FuncInst::set_associated_act(ModelAction * act, uint32_t marker)
+{
+	associated_act = act;
+	action_marker = marker;
+}
+
+ModelAction * FuncInst::get_associated_act(uint32_t marker)
+{
+	if (action_marker == marker)
+		return associated_act;
+	else
+		return NULL;
+}
+
+/* Search the FuncInst that has the same type as act in the collision list */
 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;
 }
 
+void FuncInst::add_to_collision(FuncInst * inst)
+{
+	collisions.push_back(inst);
+}
+
+/* Note: is_read() is equivalent to ModelAction::is_read() */
 bool FuncInst::is_read() const
 {
-	return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS;
+	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 == NONATOMIC_WRITE;
+}
+
+void FuncInst::print()
+{
+	model_print("func inst - pos: %s, loc: %p, type: %d,\n", position, location, type);
 }