Small edits

[c11tester.git] / execution.cc

diff --git a/execution.cc b/execution.cc
index ce9fa35b68a527fa9f2a193d9ebbc172698c9781..c1a5308712160ab4b3e1f2e3891b98d6e24466ca 100644 (file)
--- a/execution.cc
+++ b/execution.cc
@@ -1198,8 +1198,12 @@ ClockVector * ModelExecution::get_hb_from_write(ModelAction *rf) const {
                                else
                                        (vec=new ClockVector(vec, NULL))->merge(rf->get_last_fence_release()->get_cv());
                        } else {
-                               if (vec == NULL && rf->is_rmw()) {
-                                       vec = new ClockVector(NULL, NULL);
+                               if (vec == NULL) {
+                                       if (rf->is_rmw()) {
+                                               vec = new ClockVector(NULL, NULL);
+                                       }
+                               } else {
+                                       vec = new ClockVector(vec, NULL);
                                }
                        }
                        rf->set_rfcv(vec);
@@ -1815,7 +1819,7 @@ ClockVector * ModelExecution::computeMinimalCV() {
        //Thread 0 isn't a real thread, so skip it..
        for(unsigned int i = 1;i < thread_map.size();i++) {
                Thread * t = thread_map[i];
-               if (t->get_state() == THREAD_COMPLETED)
+               if (t->is_complete())
                        continue;
                thread_id_t tid = int_to_id(i);
                ClockVector * cv = get_cv(tid);