Avoid using a HashTable to associate FuncInsts with ModelActions; a slight improvemen...

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 436de34f2cdfeab75e0611a78ffd8be761747916..3c59fa01a68277cdbb74fc0a6af55698530b1b9a 100644 (file)
--- 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,7 +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;            \
+               *((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)
@@ -330,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;
 
@@ -355,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;