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

diff --git a/cmodelint.cc b/cmodelint.cc
index 20f257c..1632581 100644
--- a/cmodelint.cc
+++ b/cmodelint.cc
@@ -1,19 +1,43 @@
 #include "model.h"
+#include "action.h"
 #include "cmodelint.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.*/
 void model_write_action(void * obj, memory_order ord, uint64_t val) {
 	model->switch_to_master(new ModelAction(ATOMIC_WRITE, ord, obj, val));
 }
 
+/** Performs an init action. */
 void model_init_action(void * obj, uint64_t val) {
 	model->switch_to_master(new ModelAction(ATOMIC_INIT, memory_order_relaxed, obj, val));
 }
 
+/**
+ * Performs the read part of a RMW action. The next action must either be the
+ * write part of the RMW action or an explicit close out of the RMW action w/o
+ * a write.
+ */
+uint64_t model_rmwr_action(void *obj, memory_order ord) {
+	return model->switch_to_master(new ModelAction(ATOMIC_RMWR, ord, obj));
+}
+
+/** Performs the write part of a RMW action. */
 void model_rmw_action(void *obj, memory_order ord, uint64_t val) {
 	model->switch_to_master(new ModelAction(ATOMIC_RMW, ord, obj, val));
 }
+
+/** Closes out a RMW action without doing a write. */
+void model_rmwc_action(void *obj, memory_order ord) {
+	model->switch_to_master(new ModelAction(ATOMIC_RMWC, ord, obj));
+}
+
+/** Issues a fence operation. */
+void model_fence_action(memory_order ord) {
+	model->switch_to_master(new ModelAction(ATOMIC_FENCE, ord, FENCE_LOCATION));
+}