X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=action.h;h=fbf566fb7a8f61497284c6ab1e826dd39b0f44e0;hp=e830a74e6093ab58ccbf35bc4718537d70ed9440;hb=251ac4b4bf3a9f2d3cfacc1e6618200ca1c431ac;hpb=df55261fc251d7b6f15086393911530af340eaf4

diff --git a/action.h b/action.h
index e830a74e..fbf566fb 100644
--- a/action.h
+++ b/action.h
@@ -34,7 +34,7 @@ using std::memory_order_seq_cst;
  * iteself does not indicate no value.
  */
 #define VALUE_NONE 0xdeadbeef
-#define HAS_REFERENCE ((void *)0x1)
+#define WRITE_REFERENCED ((void *)0x1)
 
 /**
  * @brief The "location" at which a fence occurs
@@ -104,8 +104,6 @@ public:
 	thread_id_t get_tid() const { return tid; }
 	action_type get_type() const { return type; }
 	void set_type(action_type _type) { type = _type; }
-	action_type get_original_type() const { return type; }
-	void set_original_type(action_type _type) { original_type = _type; }
 	void set_free() { type = READY_FREE; }
 	memory_order get_mo() const { return order; }
 	memory_order get_original_mo() const { return original_order; }
@@ -191,19 +189,12 @@ public:
 	bool equals(const ModelAction *x) const { return this == x; }
 	void set_value(uint64_t val) { value = val; }
 
-	void use_original_type();
-
 	/* to accomodate pthread create and join */
 	Thread * thread_operand;
 	void set_thread_operand(Thread *th) { thread_operand = th; }
-	void setTraceRef(sllnode<ModelAction *> *ref) { trace_ref = ref; }
-	void setThrdMapRef(sllnode<ModelAction *> *ref) { thrdmap_ref = ref; }
+
 	void setActionRef(sllnode<ModelAction *> *ref) { action_ref = ref; }
-	void setFuncActRef(void *ref) { func_act_ref = ref; }
-	sllnode<ModelAction *> * getTraceRef() { return trace_ref; }
-	sllnode<ModelAction *> * getThrdMapRef() { return thrdmap_ref; }
 	sllnode<ModelAction *> * getActionRef() { return action_ref; }
-	void * getFuncActRef() { return func_act_ref; }
 
 	SNAPSHOTALLOC
 private:
@@ -239,10 +230,7 @@ private:
 	 */
 	ClockVector *cv;
 	ClockVector *rf_cv;
-	sllnode<ModelAction *> * trace_ref;
-	sllnode<ModelAction *> * thrdmap_ref;
 	sllnode<ModelAction *> * action_ref;
-	void * func_act_ref;
 
 	/** @brief The value written (for write or RMW; undefined for read) */
 	uint64_t value;
@@ -250,10 +238,6 @@ private:
 	/** @brief Type of action (read, write, RMW, fence, thread create, etc.) */
 	action_type type;
 
-	/** @brief The original type of action (read, write, RMW) before it was 
-	 * set as READY_FREE or weaken from a RMW to a write */
-	action_type original_type;
-
 	/** @brief The memory order for this operation. */
 	memory_order order;