X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=7c9146fdda694adfd97c7f932f75822e53a4303c;hb=8d4a273698366b54612e40742ef6fb7bd63c7090;hp=c39af5ecdb177aff649eb79ba39eb3eff1b3253c;hpb=9aae08ba6d60aa253039d2da1c3571fdde2ac159;p=model-checker.git

diff --git a/action.h b/action.h
index c39af5e..7c9146f 100644
--- a/action.h
+++ b/action.h
@@ -80,14 +80,16 @@ public:
 	void * get_location() const { return location; }
 	modelclock_t get_seq_number() const { return seq_number; }
 	uint64_t get_value() const { return value; }
+	uint64_t get_reads_from_value() const;
+	uint64_t get_write_value() const;
 	const ModelAction * get_reads_from() const { return reads_from; }
-	const Promise * get_reads_from_promise() const { return reads_from_promise; }
+	Promise * get_reads_from_promise() const { return reads_from_promise; }
 
 	Node * get_node() const;
 	void set_node(Node *n) { node = n; }
 
 	void set_read_from(const ModelAction *act);
-	void set_read_from_promise(const Promise *promise);
+	void set_read_from_promise(Promise *promise);
 
 	/** Store the most recent fence-release from the same thread
 	 *  @param fence The fence-release that occured prior to this */
@@ -153,6 +155,9 @@ public:
 
 	bool equals(const ModelAction *x) const { return this == x; }
 	bool equals(const Promise *x) const { return false; }
+
+	bool may_read_from(const ModelAction *write) const;
+	bool may_read_from(const Promise *promise) const;
 	MEMALLOC
 private:
 
@@ -175,7 +180,7 @@ private:
 	const ModelAction *reads_from;
 
 	/** The promise that this action reads from. Only valid for reads */
-	const Promise *reads_from_promise;
+	Promise *reads_from_promise;
 
 	/** The last fence release from the same thread */
 	const ModelAction *last_fence_release;
@@ -193,6 +198,4 @@ private:
 	bool sleep_flag;
 };
 
-typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
-
 #endif /* __ACTION_H__ */