X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=f8aa4f0a4fd49b6eb487539c9fece2d15146e2a0;hb=bedc2b9424e82860ac30834707b518f5f2a56751;hp=2aaa1c26dbea3ad9e78720683635a117d83243f1;hpb=55eb20c50ec656d385fb6e94c01aea55e9514917;p=model-checker.git

diff --git a/model.cc b/model.cc
index 2aaa1c2..f8aa4f0 100644
--- a/model.cc
+++ b/model.cc
@@ -1509,8 +1509,8 @@ bool ModelChecker::release_seq_heads(const ModelAction *rf,
 				continue;
 			}
 
-			/* Only writes can break release sequences */
-			if (!act->is_write())
+			/* Only non-RMW writes can break release sequences */
+			if (!act->is_write() || act->is_rmw())
 				continue;
 
 			/* Check modification order */
@@ -1815,6 +1815,7 @@ void ModelChecker::compute_promises(ModelAction *curr)
 				act->is_read() &&
 				!act->could_synchronize_with(curr) &&
 				!act->same_thread(curr) &&
+				act->get_location() == curr->get_location() &&
 				promise->get_value() == curr->get_value()) {
 			curr->get_node()->set_promise(i);
 		}
@@ -1993,6 +1994,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr)
 	if (!initialized) {
 		/** @todo Need a more informative way of reporting errors. */
 		printf("ERROR: may read from uninitialized atomic\n");
+		set_assert();
 	}
 
 	if (DBG_ENABLED() || !initialized) {
@@ -2002,8 +2004,6 @@ void ModelChecker::build_reads_from_past(ModelAction *curr)
 		curr->get_node()->print_may_read_from();
 		printf("End printing may_read_from\n");
 	}
-
-	ASSERT(initialized);
 }
 
 bool ModelChecker::sleep_can_read_from(ModelAction * curr, const ModelAction *write) {