fix edge case

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 1a03153fbeb908fe782a3cce80d7fcb7074ecab5..d3fcbb4656919157220ed5a4197ee3c58b723e75 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -97,7 +97,7 @@ void model_rmwc_action_helper(void *obj, int atomic_index, const char *position)
 #define VOLATILELOAD(size) \
        uint ## size ## _t cds_volatile_load ## size(void * obj, const char * position) { \
                ensureModel();                                                      \
-               return (uint ## size ## _t)model->switch_to_master(new ModelAction(ATOMIC_READ, position, memory_order_relaxed, obj)); \
+               return (uint ## size ## _t)model->switch_to_master(new ModelAction(ATOMIC_READ, position, memory_order_volatile_load, obj)); \
        }
 
 VOLATILELOAD(8)
@@ -109,7 +109,7 @@ VOLATILELOAD(64)
 #define VOLATILESTORE(size) \
        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)); \
+               model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, memory_order_volatile_store, 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++) {                         \
@@ -340,47 +340,50 @@ void cds_atomic_thread_fence(int atomic_index, const char * position) {
  */
 
 void cds_func_entry(const char * funcName) {
+#ifdef NEWFUZZER
        ensureModel();
-       /*
-          Thread * th = thread_current();
-          uint32_t func_id;
-
-          ModelHistory *history = model->get_history();
-          if ( !history->getFuncMap()->contains(funcName) ) {
-               // add func id to func map
-               func_id = history->get_func_counter();
-               history->incr_func_counter();
-               history->getFuncMap()->put(funcName, func_id);
-
-               // add func id to reverse func map
-               ModelVector<const char *> * func_map_rev = history->getFuncMapRev();
-               if ( func_map_rev->size() <= func_id )
-                       func_map_rev->resize( func_id + 1 );
-               func_map_rev->at(func_id) = funcName;
-          } else {
-               func_id = history->getFuncMap()->get(funcName);
-          }
-
-          history->enter_function(func_id, th->get_id());
-        */
+       Thread * th = thread_current();
+       uint32_t func_id;
+
+       ModelHistory *history = model->get_history();
+       if ( !history->getFuncMap()->contains(funcName) ) {
+               // add func id to func map
+               func_id = history->get_func_counter();
+               history->incr_func_counter();
+               history->getFuncMap()->put(funcName, func_id);
+
+               // add func id to reverse func map
+               ModelVector<const char *> * func_map_rev = history->getFuncMapRev();
+               if ( func_map_rev->size() <= func_id )
+                       func_map_rev->resize( func_id + 1 );
+
+               func_map_rev->at(func_id) = funcName;
+       } else {
+               func_id = history->getFuncMap()->get(funcName);
+       }
+
+       history->enter_function(func_id, th->get_id());
+#endif
 }
 
 void cds_func_exit(const char * funcName) {
+#ifdef NEWFUZZER
        ensureModel();
 
-/*     Thread * th = thread_current();
-        uint32_t func_id;
-
-        ModelHistory *history = model->get_history();
-        func_id = history->getFuncMap()->get(funcName);
+       Thread * th = thread_current();
+       uint32_t func_id;
 
+       ModelHistory *history = model->get_history();
+       func_id = history->getFuncMap()->get(funcName);
+/*
  * func_id not found; this could happen in the case where a function calls cds_func_entry
  * when the model has been defined yet, but then an atomic inside the function initializes
  * the model. And then cds_func_exit is called upon the function exiting.
  *
-        if (func_id == 0)
-                return;
-
-        history->exit_function(func_id, th->get_id());
  */
+       if (func_id == 0)
+               return;
+
+       history->exit_function(func_id, th->get_id());
+#endif
 }