X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cmodelint.cc;h=fdac33aa1324d5735cd96f09ab2b712a9a53119f;hb=6898da1b7c46ddf3427ea0127dc68f8cc6016511;hp=cbf21320a52b6fd0792298bdfb15492d7464e83a;hpb=bd4d831da77ae594a6790c4af7cb14abb022f80b;p=c11tester.git

diff --git a/cmodelint.cc b/cmodelint.cc
index cbf21320..fdac33aa 100644
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -112,10 +112,10 @@ VOLATILELOAD(64)
 		model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_relaxed, obj, (uint64_t) val)); \
 		*((volatile uint ## size ## _t *)obj) = val;            \
 		thread_id_t tid = thread_current()->get_id();           \
-		for(int i=0;i < size / 8;i++) {				\
+		for(int i=0;i < size / 8;i++) {                         \
 			recordWrite(tid, (void *)(((char *)obj)+i));          \
 		}                                                       \
-}
+	}
 
 VOLATILESTORE(8)
 VOLATILESTORE(16)
@@ -334,8 +334,7 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
  */
 
 void cds_func_entry(const char * funcName) {
-	if (!model) return;
-
+	ensureModel();
 	Thread * th = thread_current();
 	uint32_t func_id;
 
@@ -359,8 +358,7 @@ void cds_func_entry(const char * funcName) {
 }
 
 void cds_func_exit(const char * funcName) {
-	if (!model) return;
-
+	ensureModel();
 	Thread * th = thread_current();
 	uint32_t func_id;