fix norris bugs

[model-checker.git] / nodestack.h

diff --git a/nodestack.h b/nodestack.h
index 55deac5beffa2a6a0d3deec210c4246f0b8074db..10331c2ef59ccb00046ad62c3e40439543a1288d 100644 (file)
--- a/nodestack.h
+++ b/nodestack.h
@@ -53,7 +53,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);
@@ -90,6 +90,17 @@ public:
        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();
+       bool increment_relseq_break();
+       bool relseq_break_empty();
 
        void print();
        void print_may_read_from();
@@ -116,6 +127,12 @@ private:
        std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
        std::vector< promise_t, ModelAlloc<promise_t> > promises;
        int future_index;
+
+       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;