Remove redundant data structures and FuncNode's dependencies on old actions

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index d4288a1438384aff5520ae96aa36016fe6aa8ec6..4c5844522d607fdfbf1662277d05ad752585974c 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -4,7 +4,8 @@
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
        single_location(true),
        execution_number(0),
-       action_marker(0)        /* The marker for FuncNode starts from 1 */
+       associated_reads(),
+       thrd_marker()   /* The marker for FuncNode starts from 1 */
 {
        ASSERT(act);
        ASSERT(func_node);
@@ -47,18 +48,30 @@ bool FuncInst::add_succ(FuncInst * other)
        return true;
 }
 
-void FuncInst::set_associated_act(ModelAction * act, uint32_t marker)
+void FuncInst::set_associated_read(thread_id_t tid, uint64_t read_val, uint32_t marker)
 {
-       associated_act = act;
-       action_marker = marker;
+       int thread_id = id_to_int(tid);
+       int old_size = associated_reads.size();
+
+       if (old_size < thread_id + 1) {
+               for (int i = old_size; i < thread_id + 1; i++ ) {
+                       associated_reads.push_back(VALUE_NONE);
+                       thrd_marker.push_back(0);
+               }
+       }
+
+       thrd_marker[thread_id] = marker;
+       associated_reads[thread_id] = read_val;
 }
 
-ModelAction * FuncInst::get_associated_act(uint32_t marker)
+uint64_t FuncInst::get_associated_read(thread_id_t tid, uint32_t marker)
 {
-       if (action_marker == marker)
-               return associated_act;
+       int thread_id = id_to_int(tid);
+
+       if (thrd_marker[thread_id] == marker)
+               return associated_reads[thread_id];
        else
-               return NULL;
+               return VALUE_NONE;
 }
 
 /* Search the FuncInst that has the same type as act in the collision list */