Add a collision list for FuncInsts with the same source line number

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index 4fcf0e7cdb225e72ecb2da1c7286428bfcd90e89..df91edc848cb9a0417385bf0e6e78f31bcc321cd 100644 (file)
--- 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,18 +50,18 @@ 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();
@@ -74,7 +74,11 @@ FuncInst * FuncInst::search_in_collision(ModelAction *act)
        }
        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