action: add get_write_value()

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index 81f447a5b13f9d8e3db3e352e4be49f4659559b0..5f83c3f5604524692e88e1c9478db7bb9f7216fc 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -378,6 +378,42 @@ void ModelAction::set_try_lock(bool obtainedlock) {
                value = VALUE_TRYFAILED;
 }
 
+/**
+ * @brief Get the value read by this load
+ *
+ * We differentiate this function from ModelAction::get_write_value and
+ * ModelAction::get_value for the purpose of RMW's, which may have both a
+ * 'read' and a 'write' value.
+ *
+ * Note: 'this' must be a load.
+ *
+ * @return The value read by this load
+ */
+uint64_t ModelAction::get_reads_from_value() const
+{
+       ASSERT(is_read());
+       if (reads_from)
+               return reads_from->get_write_value();
+       return reads_from_promise->get_value();
+}
+
+/**
+ * @brief Get the value written by this store
+ *
+ * We differentiate this function from ModelAction::get_reads_from_value and
+ * ModelAction::get_value for the purpose of RMW's, which may have both a
+ * 'read' and a 'write' value.
+ *
+ * Note: 'this' must be a store.
+ *
+ * @return The value written by this store
+ */
+uint64_t ModelAction::get_write_value() const
+{
+       ASSERT(is_write());
+       return value;
+}
+
 /** @return The Node associated with this ModelAction */
 Node * ModelAction::get_node() const
 {
@@ -392,9 +428,10 @@ Node * ModelAction::get_node() const
  */
 void ModelAction::set_read_from(const ModelAction *act)
 {
+       ASSERT(act);
        reads_from = act;
        reads_from_promise = NULL;
-       if (act && act->is_uninitialized())
+       if (act->is_uninitialized())
                model->assert_bug("May read from uninitialized atomic\n");
 }
 
@@ -510,10 +547,10 @@ void ModelAction::print() const
        }
 
        uint64_t valuetoprint;
-       if (is_read() && reads_from)
-               valuetoprint = reads_from->value;
-       else if (is_read() && reads_from_promise)
-               valuetoprint = reads_from_promise->get_value();
+       if (is_read())
+               valuetoprint = get_reads_from_value();
+       else if (is_write())
+               valuetoprint = get_write_value();
        else
                valuetoprint = value;