X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cmodelint.cc;h=1632581101e0c5801f8ba14c05d3d12e1fa4c94c;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=6b20c2cc9c800378de4b2255fc94e7a7646516d7;hpb=12b1a10eeff58161619bafcfd8e288b3e2c76621;p=model-checker.git

diff --git a/cmodelint.cc b/cmodelint.cc
index 6b20c2c..1632581 100644
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -1,11 +1,11 @@
 #include "model.h"
+#include "action.h"
 #include "cmodelint.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /** Performs a read action.*/
 uint64_t model_read_action(void * obj, memory_order ord) {
-	model->switch_to_master(new ModelAction(ATOMIC_READ, ord, obj));
-	return thread_current()->get_return_value();
+	return model->switch_to_master(new ModelAction(ATOMIC_READ, ord, obj));
 }
 
 /** Performs a write action.*/
@@ -24,8 +24,7 @@ void model_init_action(void * obj, uint64_t val) {
  * a write.
  */
 uint64_t model_rmwr_action(void *obj, memory_order ord) {
-	model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
-	return thread_current()->get_return_value();
+	return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
 }
 
 /** Performs the write part of a RMW action. */
@@ -40,5 +39,5 @@ void model_rmwc_action(void *obj, memory_order ord) {
 
 /** Issues a fence operation. */
 void model_fence_action(memory_order ord) {
-	model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord, NULL));
+	model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord, FENCE_LOCATION));
 }