X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=7c79f435cff8aba9b248fba38af5ee40b8aac84c;hb=cae6e82ba84ee7f3067f1279930452ae1fb66914;hp=735b20015da604df4c13ca0ee304360866ac957b;hpb=727d6b73ba2d22dbfca36f98b1136b2de74ac784;p=c11tester.git

diff --git a/action.h b/action.h
index 735b2001..7c79f435 100644
--- a/action.h
+++ b/action.h
@@ -25,7 +25,6 @@ using std::memory_order_acquire;
 using std::memory_order_release;
 using std::memory_order_acq_rel;
 using std::memory_order_seq_cst;
-using std::volatile_order;
 
 /**
  * @brief A recognizable don't-care value for use in the ModelAction::value
@@ -56,13 +55,15 @@ typedef enum action_type {
 	PTHREAD_CREATE,	// < A pthread creation action
 	PTHREAD_JOIN,	// < A pthread join action
 	ATOMIC_UNINIT,	// < Represents an uninitialized atomic
-	ATOMIC_READ,	// < An atomic read action
+	NONATOMIC_WRITE,	// < Represents a non-atomic store
+	ATOMIC_INIT,	// < Initialization of an atomic object (e.g., atomic_init())
 	ATOMIC_WRITE,	// < An atomic write action
+	ATOMIC_RMW,	// < The write part of an atomic RMW action
+	ATOMIC_READ,	// < An atomic read action
 	ATOMIC_RMWR,	// < The read part of an atomic RMW action
 	ATOMIC_RMWRCAS,	// < The read part of an atomic RMW action
-	ATOMIC_RMW,	// < The write part of an atomic RMW action
 	ATOMIC_RMWC,	// < Convert an atomic RMW action into a READ
-	ATOMIC_INIT,	// < Initialization of an atomic object (e.g., atomic_init())
+
 	ATOMIC_FENCE,	// < A fence action
 	ATOMIC_LOCK,	// < A lock action
 	ATOMIC_TRYLOCK,	// < A trylock action
@@ -71,8 +72,6 @@ typedef enum action_type {
 	ATOMIC_NOTIFY_ALL,	// < A notify all action
 	ATOMIC_WAIT,	// < A wait action
 	ATOMIC_ANNOTATION,	// < An annotation action to pass information to a trace analysis
-	VOLATILE_READ,
-	VOLATILE_WRITE,
 	NOOP	// no operation, which returns control to scheduler
 } action_type_t;