fix conflict

[c11tester.git] / execution.h

diff --git a/execution.h b/execution.h
index 21b152b582c2f3ac32164975ecf267b8ebf9489e..74496c67d9eae8538d4ad9eaaf3c1d4345598b8e 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -122,6 +122,7 @@ private:
        bool synchronize(const ModelAction *first, ModelAction *second);
 
        void add_action_to_lists(ModelAction *act);
+       void add_normal_write_to_lists(ModelAction *act);
        void add_write_to_lists(ModelAction *act);
        ModelAction * get_last_fence_release(thread_id_t tid) const;
        ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
@@ -134,6 +135,7 @@ private:
        void w_modification_order(ModelAction *curr);
        ClockVector * get_hb_from_write(ModelAction *rf) const;
        ModelAction * get_uninitialized_action(ModelAction *curr) const;
+       ModelAction * convertNonAtomicStore(void*);
 
        action_list_t action_trace;
        SnapVector<Thread *> thread_map;
@@ -196,17 +198,17 @@ private:
 
        Thread * action_select_next_thread(const ModelAction *curr) const;
 
-       /* thrd_func_list stores a list of function ids for each thread. 
+       /* thrd_func_list stores a list of function ids for each thread.
         * Each element in thrd_func_list stores the functions that
-        * thread i has entered and yet to exit from 
+        * thread i has entered and yet to exit from
         *
         * This data structure is handled by ModelHistory
         */
        SnapVector< func_id_list_t * > thrd_func_list;
 
        /* Keeps track of atomic actions that thread i has performed in some
-        * function. Index of SnapVector is thread id. SnapList simulates 
-        * the call stack. 
+        * function. Index of SnapVector is thread id. SnapList simulates
+        * the call stack.
         *
         * This data structure is handled by ModelHistory
         */