action, model: add ASSERT(), not NULL checks

[model-checker.git] / action.cc

diff --git a/action.cc b/action.cc
index 2390ecc7bd39f115380172075d14cd9e1c56cbe8..0a6a1dd26665a6d553b4e0b7c258f519330bba56 100644 (file)
--- a/action.cc
+++ b/action.cc
@@ -392,9 +392,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");
 }
 
@@ -402,7 +403,7 @@ void ModelAction::set_read_from(const ModelAction *act)
  * 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;
@@ -543,7 +544,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) {