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 a3a2874ec7ce2c0044956803b03caefacf23ba62..c89284a70fdeccbe996df43d6cd50b53e6d0a29a 100644 (file)
--- a/funcinst.cc
+++ b/funcinst.cc
@@ -1,7 +1,9 @@
 #include "funcinst.h"
+#include "model.h"
 
 FuncInst::FuncInst(ModelAction *act, FuncNode *func_node) :
-       single_location(true)
+       single_location(true),
+       execution_number(model->get_execution_number())
 {
        ASSERT(act);
        ASSERT(func_node);
@@ -59,11 +61,14 @@ FuncInst * FuncInst::search_in_collision(ModelAction *act)
 }
 */
 
+/* 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;
 }
 
+/* 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;