Fix bug about recursive function calls

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index 4fcf0e7cdb225e72ecb2da1c7286428bfcd90e89..4c5844522d607fdfbf1662277d05ad752585974c 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -3,8 +3,9 @@
 
 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),
+       associated_reads(),
+       thrd_marker()   /* The marker for FuncNode starts from 1 */
 {
        ASSERT(act);
        ASSERT(func_node);
@@ -47,34 +48,50 @@ 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;
-       this->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 (marker == this->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 */
 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
@@ -86,7 +103,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()