#include "threads-model.h"
#include "datarace.h"
-memory_order orders[6] = {
+memory_order orders[7] = {
memory_order_relaxed, memory_order_consume, memory_order_acquire,
- memory_order_release, memory_order_acq_rel, memory_order_seq_cst
+ memory_order_release, memory_order_acq_rel, memory_order_seq_cst,
};
static void 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)); \
- *((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)); \
void cds_atomic_store ## size(void * obj, uint ## size ## _t val, int atomic_index, const char * position) { \
ensureModel(); \
model->switch_to_master(new ModelAction(ATOMIC_WRITE, position, orders[atomic_index], obj, (uint64_t) val)); \
- *((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)); \
uint ## size ## _t _val = val; \
_copy __op__ _val; \
model_rmw_action_helper(addr, (uint64_t) _copy, atomic_index, position); \
- *((uint ## size ## _t *)addr) = _copy; \
+ *((volatile uint ## size ## _t *)addr) = _copy; \
thread_id_t tid = thread_current()->get_id(); \
for(int i=0;i < size / 8;i++) { \
recordWrite(tid, (void *)(((char *)addr)+i)); \
uint ## size ## _t _old = model_rmwrcas_action_helper(addr, atomic_index, _expected, sizeof(_expected), position); \
if (_old == _expected) { \
model_rmw_action_helper(addr, (uint64_t) _desired, atomic_index, position); \
- *((uint ## size ## _t *)addr) = desired; \
+ *((volatile uint ## size ## _t *)addr) = desired; \
thread_id_t tid = thread_current()->get_id(); \
for(int i=0;i < size / 8;i++) { \
recordWrite(tid, (void *)(((char *)addr)+i)); \
*/
void cds_func_entry(const char * funcName) {
- if (!model) return;
-
+ ensureModel();
Thread * th = thread_current();
uint32_t func_id;
}
void cds_func_exit(const char * funcName) {
- if (!model) return;
-
+ ensureModel();
Thread * th = thread_current();
uint32_t func_id;