Separate the marking algorithm and action removal algorithm

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index 7f031d17d9060251992e7fd13c423e1abe6a9460..d4288a1438384aff5520ae96aa36016fe6aa8ec6 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,7 +1,10 @@
 #include "funcinst.h"
+#include "model.h"
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
-       single_location(true)
+       single_location(true),
+       execution_number(0),
+       action_marker(0)        /* The marker for FuncNode starts from 1 */
 {
        ASSERT(act);
        ASSERT(func_node);
@@ -44,20 +47,38 @@ 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();
 
        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
@@ -69,7 +90,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()