Make sure that actions that do writes are labeled correctly in predicate trees

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 2a5781bb51da8823cf99b04a9a53bb5847663e45..b022284a2fb52a6d36ca67c8649f230f3d96d917 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -9,7 +9,7 @@
 #include "history.h"
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
-typedef HashTable<void *, uint64_t, uintptr_t, 4> read_map_t;
+typedef HashTable<FuncInst *, ModelAction *, uintptr_t, 0> inst_act_map_t;
 
 class FuncNode {
 public:
@@ -32,16 +32,8 @@ public:
 
        void update_tree(action_list_t * act_list);
        void update_inst_tree(func_inst_list_t * inst_list);
-
-       void store_read(ModelAction * act, uint32_t tid);
-       uint64_t query_last_read(void * location, uint32_t tid);
-       void clear_read_map(uint32_t tid);
-
-       /* TODO: generate EQUALITY or NULLITY predicate based on write_history in history.cc */
        void update_predicate_tree(action_list_t * act_list);
-       void deep_update(Predicate * pred);
-       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, HashTable<FuncInst *, ModelAction *, uintptr_t, 0>* inst_act_map, SnapVector<Predicate *> * unset_predicates);
-       void gen_predicate_and_follow(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, HashTable<void *, ModelAction *, uintptr_t, 0> * loc_act_map, token_t token, void * loc);
+       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, HashTable<FuncInst *, ModelAction *, uintptr_t, 0> * inst_act_map, SnapVector<Predicate *> * unset_predicates);
 
        void incr_exit_count() { exit_count++; }
        uint32_t get_exit_count() { return exit_count; }
@@ -52,9 +44,18 @@ public:
        void add_to_val_loc_map(value_set_t * values, void * loc);
        void update_loc_may_equal_map(void * new_loc, loc_set_t * old_locations);
 
+       void init_predicate_tree_position(thread_id_t tid);
+       void set_predicate_tree_position(thread_id_t tid, Predicate * pred);
+       Predicate * get_predicate_tree_position(thread_id_t tid);
+
+       void init_inst_act_map(thread_id_t tid);
+       void reset_inst_act_map(thread_id_t tid);
+       void update_inst_act_map(thread_id_t tid, ModelAction * read_act);
+       inst_act_map_t * get_inst_act_map(thread_id_t tid);
+
        void print_predicate_tree();
        void print_val_loc_map();
-       void print_last_read(uint32_t tid);
+       void print_last_read(thread_id_t tid);
 
        MEMALLOC
 private:
@@ -77,21 +78,27 @@ private:
        /* Possible entry atomic actions in this function */
        func_inst_list_mt entry_insts;
 
-       /* Store the values read by atomic read actions per memory location for each thread */
-       //ModelVector<read_map_t *> thrd_read_map;
+       void infer_predicates(FuncInst * next_inst, ModelAction * next_act, HashTable<void *, ModelAction *, uintptr_t, 0> * loc_act_map, SnapVector<struct half_pred_expr *> * half_pred_expressions);
+       void generate_predicates(Predicate ** curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * half_pred_expressions);
+       bool amend_predicate_expr(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act);
 
        /* Store action_lists when calls to update_tree are deferred */
        ModelList<action_list_t *> action_list_buffer;
 
        /* read_locations: set of locations read by this FuncNode
         * val_loc_map: keep track of locations that have the same values written to;
-        * loc_may_equal_map: deduced from val_loc_map;
-        */
-
+        * loc_may_equal_map: look up locations that may share the same value as key; 
+        *                      deduced from val_loc_map;       */
        loc_set_t * read_locations;
        HashTable<uint64_t, loc_set_t *, uint64_t, 0> * val_loc_map;
        HashTable<void *, loc_set_t *, uintptr_t, 0> * loc_may_equal_map;
-       value_set_t * values_may_read_from;
+       // value_set_t * values_may_read_from;
+
+       /* Run-time position in the predicate tree for each thread */
+       ModelVector<Predicate *> predicate_tree_position;
+
+       /* A run-time map from FuncInst to ModelAction for each thread; needed by NewFuzzer */
+       SnapVector<inst_act_map_t *> * thrd_inst_act_map;
 };
 
 #endif /* __FUNCNODE_H__ */