X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=funcinst.cc;h=037f5f4b17711950ae5edc3666c1362874876a16;hp=c89284a70fdeccbe996df43d6cd50b53e6d0a29a;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=644f5fcbc3a95a02db9ace6386f782c9d1e6f94d

diff --git a/funcinst.cc b/funcinst.cc
index c89284a7..037f5f4b 100644
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -3,7 +3,9 @@
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
 	single_location(true),
-	execution_number(model->get_execution_number())
+	execution_number(0),
+	associated_reads(),
+	thrd_markers()
 {
 	ASSERT(act);
 	ASSERT(func_node);
@@ -46,20 +48,66 @@ bool FuncInst::add_succ(FuncInst * other)
 	return true;
 }
 
-/*
+void FuncInst::set_associated_read(thread_id_t tid, int index, uint32_t marker, uint64_t read_val)
+{
+	int thread_id = id_to_int(tid);
+
+	if (associated_reads.size() < (uint) thread_id + 1) {
+		int old_size = associated_reads.size();
+		int new_size = thread_id + 1;
+
+		associated_reads.resize(new_size);
+		thrd_markers.resize(new_size);
+
+		for (int i = old_size;i < new_size;i++ ) {
+			associated_reads[i] = new ModelVector<uint64_t>();
+			thrd_markers[i] = new ModelVector<uint32_t>();
+		}
+	}
+
+	ModelVector<uint64_t> * read_values = associated_reads[thread_id];
+	ModelVector<uint32_t> * markers = thrd_markers[thread_id];
+	if (read_values->size() < (uint) index + 1) {
+		int old_size = read_values->size();
+
+		for (int i = old_size;i < index + 1;i++) {
+			read_values->push_back(VALUE_NONE);
+			markers->push_back(0);
+		}
+	}
+
+	(*read_values)[index] = read_val;
+	(*markers)[index] = marker;
+}
+
+uint64_t FuncInst::get_associated_read(thread_id_t tid, int index, uint32_t marker)
+{
+	int thread_id = id_to_int(tid);
+
+	if ( (*thrd_markers[thread_id])[index] == marker)
+		return (*associated_reads[thread_id])[index];
+	else
+		return VALUE_NONE;
+}
+
+/* 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
@@ -71,7 +119,7 @@ bool FuncInst::is_read() const
  * 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 == NONATOMIC_WRITE;
 }
 
 void FuncInst::print()