X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=action.h;h=7c9146fdda694adfd97c7f932f75822e53a4303c;hb=ddb5900f2e0dbde556fd320960f048965cf4f2c2;hp=63c0375211c513ef704c4ee4c3fbb8abe832fdb5;hpb=c399a44cb63c43c83c11fe6cfab02889896ecff1;p=c11tester.git diff --git a/action.h b/action.h index 63c03752..7c9146fd 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;