X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=funcinst.cc;h=95e93fc20e6865e90c1c67cf05e2df049458b12f;hb=6fe36b2ea5cb9cd9ab58dab7f011b33d2a097e30;hp=4fcf0e7cdb225e72ecb2da1c7286428bfcd90e89;hpb=d24f2b5cb874f2ebe2a27333a16721821ba737d4;p=c11tester.git

diff --git a/funcinst.cc b/funcinst.cc
index 4fcf0e7c..95e93fc2 100644
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -3,8 +3,8 @@
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
 	single_location(true),
-	execution_number(model->get_execution_number()),
-	marker(0)	/* The marker for FuncNode starts from 1 */
+	execution_number(0),
+	action_marker(0)	/* The marker for FuncNode starts from 1 */
 {
 	ASSERT(act);
 	ASSERT(func_node);
@@ -50,31 +50,35 @@ bool FuncInst::add_succ(FuncInst * other)
 void FuncInst::set_associated_act(ModelAction * act, uint32_t marker)
 {
 	associated_act = act;
-	this->marker = marker;
+	action_marker = marker;
 }
 
 ModelAction * FuncInst::get_associated_act(uint32_t marker)
 {
-	if (marker == this->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();
 
 	mllnode<FuncInst*> * it;
-	for (it = collisions.begin(); it != NULL; it = it->getNext()) {
+	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