X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.cc;h=757b3d1d2fcc53bf1ed86a711785a84f808d1883;hb=c4c6c997cb5d2d651d4dfa76390a42592432d266;hp=130902491a97f794f13e98b917bb84522e8b0f64;hpb=bb168337e93650eddb90df61b109db4e1e8570c9;p=model-checker.git

diff --git a/action.cc b/action.cc
index 1309024..757b3d1 100644
--- a/action.cc
+++ b/action.cc
@@ -378,6 +378,44 @@ 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();
+	else if (reads_from_promise)
+		return reads_from_promise->get_value();
+	return VALUE_NONE; /* Only for new actions with no reads-from */
+}
+
+/**
+ * @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 +430,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 +549,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;
 
@@ -543,7 +582,13 @@ void ModelAction::print() const
 	if (is_read()) {
 		if (reads_from)
 			model_print("  Rf: %-3d", reads_from->get_seq_number());
-		else
+		else if (reads_from_promise) {
+			int idx = model->get_promise_number(reads_from_promise);
+			if (idx >= 0)
+				model_print("  Rf: P%-2d", idx);
+			else
+				model_print("  RF: P? ");
+		} else
 			model_print("  Rf: ?  ");
 	}
 	if (cv) {