- model->switch_to_master(new ModelAction(ATOMIC_RMWR, __x__, (void *) __p__));
- bool result = (bool) thread_current()->get_return_value();
- model->switch_to_master(new ModelAction(ATOMIC_RMW, __x__, (void *) __p__, true));
+ bool result = (bool) model->switch_thread(new ModelAction(ATOMIC_RMWR, __x__, (void *) __p__));
+ model->switch_thread(new ModelAction(ATOMIC_RMW, __x__, (void *) __p__, true));