run tabbing pass

[c11tester.git] / action.cc

diff --git a/action.cc b/action.cc
index af849074a199cc15d5e5d30e1e727a240cc81284..9a816de3837028c1dcec90d669237f8ba095fd49 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -31,9 +31,10 @@
  * @param thread (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, memory_order order, void *loc, 
-               uint64_t value, Thread *thread) :
+ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
+                                                                                                uint64_t value, Thread *thread) :
        location(loc),
+       position(NULL),
        reads_from(NULL),
        last_fence_release(NULL),
        node(NULL),
@@ -45,7 +46,7 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
        seq_number(ACTION_INITIAL_CLOCK)
 {
        /* References to NULL atomic variables can end up here */
-       ASSERT(loc || type == ATOMIC_FENCE);
+       ASSERT(loc || type == ATOMIC_FENCE || type == NOOP);
 
        Thread *t = thread ? thread : thread_current();
        this->tid = t->get_id();
@@ -65,8 +66,9 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
  * (default), then a Thread is assigned according to the scheduler.
  */
 ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
-               uint64_t value, int size) :
+                                                                                                uint64_t value, int size) :
        location(loc),
+       position(NULL),
        reads_from(NULL),
        last_fence_release(NULL),
        node(NULL),
@@ -98,8 +100,8 @@ ModelAction::ModelAction(action_type_t type, memory_order order, void *loc,
  * @param thread (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, Thread *thread) :
+ModelAction::ModelAction(action_type_t type, const char * position, memory_order order,
+                                                                                                void *loc, uint64_t value, Thread *thread) :
        location(loc),
        position(position),
        reads_from(NULL),
@@ -117,7 +119,7 @@ ModelAction::ModelAction(action_type_t type, const char * position, memory_order
 
        Thread *t = thread ? thread : thread_current();
        this->tid = t->get_id();
-       model_print("position: %s\n", position);
+       // model_print("position: %s\n", position);
 }
 
 
@@ -502,6 +504,7 @@ uint64_t ModelAction::get_reads_from_value() const
        ASSERT(is_read());
        if (reads_from)
                return reads_from->get_write_value();
+
        return VALUE_NONE;      // Only for new actions with no reads-from
 }