add more functions

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 77559136f53ab3cb7d673e906a8cfb2c225233de..b9eb214a5cffe4918939407a50526c28afedc925 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -11,17 +11,29 @@ memory_order orders[6] = {
        memory_order_release, memory_order_acq_rel, memory_order_seq_cst
 };
 
-static void ensureModel(ModelAction * action) {
-       if (!modelchecker_started) {
-               if (!model) {
-                       snapshot_system_init(10000, 1024, 1024, 40000);
-                       model = new ModelChecker();
-               }
-               model->get_execution()->check_current_action(action);
-       } else {
-               model->switch_to_master(action);
+#define ensureModel(action) \
+       if (!modelchecker_started) {                  \
+               if (!model) { \
+                       snapshot_system_init(10000, 1024, 1024, 40000); \
+                       model = new ModelChecker(); \
+               } \
+               model->get_execution()->check_current_action(action); \
+       }else { \
+               model->switch_to_master(action); \
+       }
+
+
+#define ensureModelValue(action, type)          \
+       if (!modelchecker_started) { \
+               if (!model) { \
+                       snapshot_system_init(10000, 1024, 1024, 40000); \
+                       model = new ModelChecker(); \
+               } \
+               model->get_execution()->check_current_action(action); \
+               return (type) thread_current()->get_return_value();   \
+       } else { \
+               return (type) model->switch_to_master(action);        \
        }
-}
 
 /** Performs a read action.*/
 uint64_t model_read_action(void * obj, memory_order ord) {
@@ -74,27 +86,19 @@ void model_fence_action(memory_order ord) {
 
 /* ---  helper functions --- */
 uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) {
-       return model->switch_to_master(
-               new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj)
-               );
+       ensureModelValue(new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj), uint64_t);
 }
 
 uint64_t model_rmwr_action_helper(void *obj, int atomic_index, const char *position) {
-       return model->switch_to_master(
-               new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj)
-               );
+       ensureModelValue(new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj), uint64_t);
 }
 
 void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index, const char * position) {
-       model->switch_to_master(
-               new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val)
-               );
+       ensureModel(new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val));
 }
 
 void model_rmwc_action_helper(void *obj, int atomic_index, const char *position) {
-       model->switch_to_master(
-               new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj)
-               );
+       ensureModel(new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj));
 }
 
 // cds atomic inits
@@ -122,24 +126,21 @@ void cds_atomic_init64(void * obj, uint64_t val, const char * position) {
 
 // cds atomic loads
 uint8_t cds_atomic_load8(void * obj, int atomic_index, const char * position) {
-       return (uint8_t) ( model->switch_to_master(
-                                                                                        new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
-                                                                                );
+       ensureModelValue(
+               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj), uint8_t);
 }
 uint16_t cds_atomic_load16(void * obj, int atomic_index, const char * position) {
-       return (uint16_t) ( model->switch_to_master(
-                                                                                               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
-                                                                                       );
+       ensureModelValue(
+               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj), uint16_t);
 }
 uint32_t cds_atomic_load32(void * obj, int atomic_index, const char * position) {
-       return (uint32_t) ( model->switch_to_master(
-                                                                                               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj))
-                                                                                       );
+       ensureModelValue(
+               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj), uint32_t
+               );
 }
 uint64_t cds_atomic_load64(void * obj, int atomic_index, const char * position) {
-       return model->switch_to_master(
-               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj)
-               );
+       ensureModelValue(
+               new ModelAction(ATOMIC_READ, position, orders[atomic_index], obj), uint64_t);
 }
 
 // cds atomic stores