volatile support

[c11tester.git] / cmodelint.cc

diff --git a/cmodelint.cc b/cmodelint.cc
index 67364d5abf7a9a3a51178a8dc4f5f37fea0f7283..d3b64b156c79b72a27662e2fd6ab92ca3e1a01fc 100644 (file)
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -13,7 +13,6 @@
 memory_order orders[8] = {
        memory_order_relaxed, memory_order_consume, memory_order_acquire,
        memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
-       volatile_order
 };
 
 static void ensureModel() {
@@ -95,46 +94,29 @@ void model_rmwc_action_helper(void *obj, int atomic_index, const char *position)
 }
 
 // cds volatile loads
-uint8_t cds_volatile_load8(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return (uint8_t) model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj));
-}
-uint16_t cds_volatile_load16(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return (uint16_t) model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj));
-}
-uint32_t cds_volatile_load32(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return (uint32_t) model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj)
-               );
-}
-uint64_t cds_volatile_load64(void * obj, int atomic_index, const char * position) {
-       ensureModel();
-       return model->switch_to_master(
-               new ModelAction(VOLATILE_READ, position, orders[atomic_index], obj));
-}
+#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)); \
+  }
+
+VOLATILELOAD(8)
+VOLATILELOAD(16)
+VOLATILELOAD(32)
+VOLATILELOAD(64)
 
 // cds volatile stores
-void cds_volatile_store8(void * obj, uint8_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
-void cds_volatile_store16(void * obj, uint16_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
-void cds_volatile_store32(void * obj, uint32_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
-}
-void cds_volatile_store64(void * obj, uint64_t val, int atomic_index, const char * position) {
-       ensureModel();
-       model->switch_to_master(new ModelAction(VOLATILE_WRITE, position, orders[atomic_index], obj, (uint64_t) val));
+#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)); \
 }
 
+VOLATILESTORE(8)
+VOLATILESTORE(16)
+VOLATILESTORE(32)
+VOLATILESTORE(64)
+
 // cds atomic inits
 #define CDSATOMICINT(size)                                              \
        void cds_atomic_init ## size (void * obj, uint ## size ## _t val, const char * position) { \