fix a bug for ATOMIC_RMWCAS

diff --git a/action.cc b/action.cc
index 9a816de3837028c1dcec90d669237f8ba095fd49..3059e0d94be8a90c5db19ce0114cc44062f9c6aa 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -87,6 +87,40 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
 }
 
 
+/**
+ * @brief Construct a new ModelAction with source line number (requires llvm support)
+ *
+ * @param type The type of action
+ * @param order The memory order of this action. A "don't care" for non-ATOMIC
+ * actions (e.g., THREAD_* or MODEL_* actions).
+ * @param loc The location that this action acts upon
+ * @param value (optional) A value associated with the action (e.g., the value
+ * read or written). Defaults to a given macro constant, for debugging purposes.
+ * @param size (optional) The Thread in which this action occurred. If NULL
+ * (default), then a Thread is assigned according to the scheduler.
+ */
+ModelAction::ModelAction(action_type_t type, const char * position, memory_order order, void *loc,
+                                                                                                uint64_t value, int size) :
+       location(loc),
+       position(position),
+       reads_from(NULL),
+       last_fence_release(NULL),
+       node(NULL),
+       cv(NULL),
+       value(value),
+       type(type),
+       order(order),
+       original_order(order),
+       seq_number(ACTION_INITIAL_CLOCK)
+{
+       /* References to NULL atomic variables can end up here */
+       ASSERT(loc);
+       this->size = size;
+       Thread *t = thread_current();
+       this->tid = t->get_id();
+}
+
+
 /**
  * @brief Construct a new ModelAction with source line number (requires llvm support)
  *

diff --git a/action.h b/action.h
index 5f7d25c3f38b394e690f2bf946e44fe5ed4eb944..a2a947bde582b0c925a1ee713483a9b961d4c432 100644 (file)
--- a/action.h
+++ b/action.h
@@ -86,6 +86,7 @@ class ModelAction {
 public:
        ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
        ModelAction(action_type_t type, memory_order order, void *loc, uint64_t value, int size);
+       ModelAction(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value, int size);
        ModelAction(action_type_t type, const char * position, memory_order order, void *loc, uint64_t value = VALUE_NONE, Thread *thread = NULL);
        ~ModelAction();
        void print() const;

diff --git a/cmodelint.cc b/cmodelint.cc
index 3dbb437b9914e42b0f045dda81b31af223aa2620..184bb40ef76cfe80b12ef4ebcd9e2751fa57abbf 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -61,7 +61,7 @@ void model_fence_action(memory_order ord) {
 /* ---  helper functions --- */
 uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) {
        return model->switch_to_master(
-               new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj)
+               new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj, oldval, size)
                );
 }