-// --------------------- helper functions --------------------------------
-uint64_t model_rmwr_action_helper(void *obj, int atomic_index) {
- return model->switch_to_master(new ModelAction(ATOMIC_RMWR, orders[atomic_index], obj));
-}
-
-void model_rmw_action_helper(void *obj, int atomic_index, uint64_t val) {
- model->switch_to_master(new ModelAction(ATOMIC_RMW, orders[atomic_index], obj, val));
-}
-
-void model_rmwc_action_helper(void *obj, int atomic_index) {
- model->switch_to_master(new ModelAction(ATOMIC_RMWC, orders[atomic_index], obj));
-}
-
-void model_fence_action_helper(int atomic_index) {
- model->switch_to_master(new ModelAction(ATOMIC_FENCE, orders[atomic_index], FENCE_LOCATION));
-}
+/* --- helper functions --- */
+uint64_t model_rmwrcas_action_helper(void *obj, int atomic_index, uint64_t oldval, int size, const char *position) {
+ ensureModel();
+ return model->switch_to_master(new ModelAction(ATOMIC_RMWRCAS, position, orders[atomic_index], obj, oldval, size));
+}
+
+uint64_t model_rmwr_action_helper(void *obj, int atomic_index, const char *position) {
+ ensureModel();
+ return model->switch_to_master(new ModelAction(ATOMIC_RMWR, position, orders[atomic_index], obj));
+}
+
+void model_rmw_action_helper(void *obj, uint64_t val, int atomic_index, const char * position) {
+ ensureModel();
+ model->switch_to_master(new ModelAction(ATOMIC_RMW, position, orders[atomic_index], obj, val));
+}
+
+void model_rmwc_action_helper(void *obj, int atomic_index, const char *position) {
+ ensureModel();
+ model->switch_to_master(new ModelAction(ATOMIC_RMWC, position, orders[atomic_index], obj));
+}
+
+// cds volatile loads
+#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
+#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)); \
+ *((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)
+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) { \
+ ensureModel(); \
+ model->switch_to_master(new ModelAction(ATOMIC_INIT, 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)); \
+ } \
+ }
+
+CDSATOMICINT(8)
+CDSATOMICINT(16)
+CDSATOMICINT(32)
+CDSATOMICINT(64)