get rid of an unused function

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index c84815cf3326706622b120fca383759555f25ed5..9cf082bd723234957b50cf2eb1a03b5ecba24544 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -39,15 +39,20 @@ public:
 
        /* 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 generate_predicate(Predicate ** curr_pred, FuncInst * next_inst, SnapVector<struct half_pred_expr *> * half_pred_expressions);
 
        void incr_exit_count() { exit_count++; }
        uint32_t get_exit_count() { return exit_count; }
 
        ModelList<action_list_t *> * get_action_list_buffer() { return &action_list_buffer; }
 
+       void add_to_val_loc_map(uint64_t val, void * loc);
+       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 print_predicate_tree();
+       void print_val_loc_map();
        void print_last_read(uint32_t tid);
 
        MEMALLOC
@@ -65,16 +70,27 @@ private:
         */
        HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_inst_map;
 
-       /* list of all atomic actions in this function */
+       /* List of all atomic actions in this function */
        func_inst_list_mt inst_list;
 
-       /* possible entry atomic actions in this function */
+       /* 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;
+       //ModelVector<read_map_t *> thrd_read_map;
 
+       /* 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_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;
 };
 
 #endif /* __FUNCNODE_H__ */