X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cmodelint.cc;h=3c59fa01a68277cdbb74fc0a6af55698530b1b9a;hb=cd6a138fadb0cf3e886fa1407a3d571578b60cbe;hp=92eea8514c53dcf8184beaa96f3832f8f36e6d5f;hpb=3c4cdc788494bfd2fa3b22e6487c465132b59006;p=c11tester.git

diff --git a/cmodelint.cc b/cmodelint.cc
index 92eea851..3c59fa01 100644
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -10,7 +10,7 @@
 #include "threads-model.h"
 #include "datarace.h"
 
-memory_order orders[8] = {
+memory_order orders[7] = {
 	memory_order_relaxed, memory_order_consume, memory_order_acquire,
 	memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
 };
@@ -110,6 +110,11 @@ VOLATILELOAD(64)
 	void cds_volatile_store ## size (void * obj, uint ## size ## _t val, const char * position) { \
 		ensureModel();                                                      \
 		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++) {                         \
+			recordWrite(tid, (void *)(((char *)obj)+i));          \
+		}                                                       \
 	}
 
 VOLATILESTORE(8)
@@ -122,7 +127,7 @@ VOLATILESTORE(64)
 	void cds_atomic_init ## size (void * obj, uint ## size ## _t val, const char * position) { \
 		ensureModel();                                                      \
 		model->switch_to_master(new ModelAction(ATOMIC_INIT, position, memory_order_relaxed, obj, (uint64_t) val)); \
-		*((uint ## size ## _t *)obj) = val;                                 \
+		*((volatile uint ## size ## _t *)obj) = val;                                 \
 		thread_id_t tid = thread_current()->get_id();           \
 		for(int i=0;i < size / 8;i++) {                       \
 			recordWrite(tid, (void *)(((char *)obj)+i));          \
@@ -152,7 +157,7 @@ CDSATOMICLOAD(64)
 	void cds_atomic_store ## size(void * obj, uint ## size ## _t val, int atomic_index, const char * position) { \
 		ensureModel();                                                        \
 		model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)); \
-		*((uint ## size ## _t *)obj) = val;                     \
+		*((volatile uint ## size ## _t *)obj) = val;                     \
 		thread_id_t tid = thread_current()->get_id();           \
 		for(int i=0;i < size / 8;i++) {                       \
 			recordWrite(tid, (void *)(((char *)obj)+i));          \
@@ -172,7 +177,7 @@ CDSATOMICSTORE(64)
 		uint ## size ## _t _val = val;                                            \
 		_copy __op__ _val;                                                    \
 		model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position);        \
-		*((uint ## size ## _t *)addr) = _copy;                  \
+		*((volatile uint ## size ## _t *)addr) = _copy;                  \
 		thread_id_t tid = thread_current()->get_id();           \
 		for(int i=0;i < size / 8;i++) {                       \
 			recordWrite(tid, (void *)(((char *)addr)+i));         \
@@ -257,7 +262,7 @@ CDSATOMICXOR(64)
 		uint ## size ## _t _old = model_rmwrcas_action_helper(addr, atomic_index, _expected, sizeof(_expected), position); \
 		if (_old == _expected) {                                                                    \
 			model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); \
-			*((uint ## size ## _t *)addr) = desired;                        \
+			*((volatile uint ## size ## _t *)addr) = desired;                        \
 			thread_id_t tid = thread_current()->get_id();           \
 			for(int i=0;i < size / 8;i++) {                       \
 				recordWrite(tid, (void *)(((char *)addr)+i));         \
@@ -329,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;
 
@@ -354,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;