X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=986b9c9df4be85f15d57cbf13f46d62626a3c35d;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=cb281cad65b1dbf7f60892f9c656ce0061afee84;hpb=8f379cb70822bfd5498da9997ad4f7c3b37a18ed;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index cb281ca..986b9c9 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -24,11 +24,14 @@ class Thread;
  * <li>@b fulfilled: satisfied by this Node's ModelAction under the current
  * configuration.</li></ol>
  */
-typedef enum {
-	PROMISE_IGNORE = 0, /**< This promise is inapplicable; ignore it */
-	PROMISE_UNFULFILLED, /**< This promise is applicable but unfulfilled */
-	PROMISE_FULFILLED /**< This promise is applicable and fulfilled */
-} promise_t;
+
+#define	PROMISE_IGNORE 0 /**< This promise is inapplicable; ignore it */
+#define	PROMISE_UNFULFILLED 1 /**< This promise is applicable but unfulfilled */
+#define	PROMISE_FULFILLED 2 /**< This promise is applicable and fulfilled */
+#define PROMISE_MASK 0xf
+#define PROMISE_RMW 0x10
+
+typedef int promise_t;
 
 struct future_value {
 	uint64_t value;
@@ -53,7 +56,7 @@ struct fairness_info {
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
+	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = NULL);
 	~Node();
 	/* return true = thread choice has already been explored */
 	bool has_been_explored(thread_id_t tid);
@@ -66,6 +69,8 @@ public:
 	thread_id_t get_next_backtrack();
 	bool is_enabled(Thread *t);
 	bool is_enabled(thread_id_t tid);
+	enabled_type_t enabled_status(thread_id_t tid);
+
 	ModelAction * get_action() { return action; }
 	bool has_priority(thread_id_t tid);
 	int get_num_threads() {return num_threads;}
@@ -86,10 +91,16 @@ public:
 	int get_read_from_size();
 	const ModelAction * get_read_from_at(int i);
 
-	void set_promise(unsigned int i);
+	void set_promise(unsigned int i, bool is_rmw);
 	bool get_promise(unsigned int i);
 	bool increment_promise();
 	bool promise_empty();
+	enabled_type_t *get_enabled_array() {return enabled_array;}
+
+	void set_misc_max(int i);
+	int get_misc();
+	bool increment_misc();
+	bool misc_empty();
 
 	void add_relseq_break(const ModelAction *write);
 	const ModelAction * get_relseq_break();
@@ -124,6 +135,9 @@ private:
 
 	std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
 	int relseq_break_index;
+
+	int misc_index;
+	int misc_max;
 };
 
 typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;