Do not unset FuncInst locations when new executions start; check if execution numbers...

[c11tester.git] / funcinst.h

diff --git a/funcinst.h b/funcinst.h
index bc56e2772544869097979b42bee45e7f44b1b675..ae3aa09325148a58925819c977faa4d66aa3684c 100644 (file)
--- a/funcinst.h
+++ b/funcinst.h
@@ -13,40 +13,63 @@ public:
        FuncInst(ModelAction *act, FuncNode *func_node);
        ~FuncInst();
 
-       //ModelAction * get_action() const { return action; }
        const char * get_position() const { return position; }
+
        void * get_location() const { return location; }
+       void set_location(void * loc) { location = loc; }
+
        action_type get_type() const { return type; }
+       memory_order get_mo() const { return order; }
        FuncNode * get_func_node() const { return func_node; }
 
        bool add_pred(FuncInst * other);
        bool add_succ(FuncInst * other);
 
-       FuncInst * search_in_collision(ModelAction *act);
+       //FuncInst * search_in_collision(ModelAction *act);
+       //func_inst_list_mt * get_collisions() { return &collisions; }
 
-       func_inst_list_mt * get_collisions() { return &collisions; }
        func_inst_list_mt * get_preds() { return &predecessors; }
        func_inst_list_mt * get_succs() { return &successors; }
 
        bool is_read() const;
        bool is_write() const;
+       bool is_single_location() { return single_location; }
+       void not_single_location() { single_location = false; }
+
+       void set_execution_number(int new_number) { execution_number = new_number; }
+       int get_execution_number() { return execution_number; }
+
+       void print();
 
        MEMALLOC
 private:
-       //ModelAction * const action;
        const char * position;
+
+       /* Atomic operations with the same source line number may act at different
+        * memory locations, such as the next field of the head pointer in ms-queue. 
+        * location only stores the memory location when this FuncInst was constructed.
+        */
        void * location;
+
+       /* NOTE: for rmw actions, func_inst and act may have different
+        * action types because of action type conversion in ModelExecution */
        action_type type;
+
+       memory_order order;
        FuncNode * func_node;
 
-       /* collisions store a list of FuncInsts with the same position
+       bool single_location;
+       int execution_number;
+
+       /* Currently not in use. May remove this field later
+        *
+        * collisions store a list of FuncInsts with the same position
         * but different action types. For example, CAS is broken down
         * as three different atomic operations in cmodelint.cc */
-       func_inst_list_mt collisions;
+       // func_inst_list_mt collisions;
 
        func_inst_list_mt predecessors;
        func_inst_list_mt successors;
 };
 
 #endif /* __FUNCINST_H__ */
-