Do not unset FuncInst locations when new executions start; check if execution numbers...

[c11tester.git] / funcinst.cc

diff --git a/funcinst.cc b/funcinst.cc
index 8d9c23ba9c81d48b0c1856c53b89f05eb636c3e0..c89284a70fdeccbe996df43d6cd50b53e6d0a29a 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,13 +1,16 @@
 #include "funcinst.h"
+#include "model.h"
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
-       collisions()
+       single_location(true),
+       execution_number(model->get_execution_number())
 {
        ASSERT(act);
        ASSERT(func_node);
        this->position = act->get_position();
        this->location = act->get_location();
        this->type = act->get_type();
+       this->order = act->get_mo();
        this->func_node = func_node;
 }
 
@@ -43,26 +46,35 @@ bool FuncInst::add_succ(FuncInst * other)
        return true;
 }
 
+/*
 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()) {
+       mllnode<FuncInst*> * it;
+       for (it = collisions.begin(); it != NULL; it = it->getNext()) {
                FuncInst * inst = it->getVal();
-               if ( inst->get_type() == type )
+               if (inst->get_type() == type)
                        return inst;
        }
        return NULL;
 }
+*/
 
+/* Note: is_read() is equivalent to ModelAction::is_read() */
 bool FuncInst::is_read() const
 {
-       return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS;    /* type == ATOMIC_RMW ? */
+       return type == ATOMIC_READ || type == ATOMIC_RMWR || type == ATOMIC_RMWRCAS || type == ATOMIC_RMW;
 }
 
+/* Note: because of action type conversion in ModelExecution
+ * 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;
 }
 
+void FuncInst::print()
+{
+       model_print("func inst - pos: %s, loc: %p, type: %d,\n", position, location, type);
+}