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
{
*/
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");
}
* Set this action's read-from promise
* @param promise The promise to read from
*/
-void ModelAction::set_read_from_promise(const Promise *promise)
+void ModelAction::set_read_from_promise(Promise *promise)
{
ASSERT(is_read());
reads_from_promise = promise;
}
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;
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) {