small changes

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 133d5522df64810c138d49c2257f373cfe01ff89..35f1969dcc8cce36e51a878264efeea49fa157ba 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -9,7 +9,7 @@
 #define MAX_DIST 10
 
 typedef ModelList<FuncInst *> func_inst_list_mt;
-typedef ModelList<Predicate *> predicate_trace_t;
+typedef ModelVector<Predicate *> predicate_trace_t;
 
 typedef HashTable<void *, FuncInst *, uintptr_t, 0, model_malloc, model_calloc, model_free> loc_inst_map_t;
 typedef HashTable<FuncInst *, uint32_t, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_id_map_t;
@@ -34,7 +34,6 @@ public:
        FuncInst * create_new_inst(ModelAction *act);
        FuncInst * get_inst(ModelAction *act);
 
-       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInstMap() { return &func_inst_map; }
        func_inst_list_mt * get_inst_list() { return &inst_list; }
        func_inst_list_mt * get_entry_insts() { return &entry_insts; }
        void add_entry_inst(FuncInst * inst);
@@ -43,23 +42,16 @@ public:
        void function_exit_handler(thread_id_t tid);
 
        void update_tree(ModelAction * act);
-       void update_inst_tree(func_inst_list_t * inst_list);
-       void update_predicate_tree(ModelAction * act);
-       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, Predicate ** unset_predicate);
 
        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 set_predicate_tree_position(thread_id_t tid, Predicate * pred);
        Predicate * get_predicate_tree_position(thread_id_t tid);
 
        void add_predicate_to_trace(thread_id_t tid, Predicate *pred);
 
-       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);
+       uint64_t get_associated_read(thread_id_t tid, FuncInst * inst);
 
        void add_out_edge(FuncNode * other);
        ModelList<FuncNode *> * get_out_edges() { return &out_edges; }
@@ -77,8 +69,9 @@ private:
 
        uint32_t inst_counter;
        uint32_t marker;
+       uint32_t exit_count;
        ModelVector< ModelVector<uint32_t> *> thrd_markers;
-       ModelVector<int> thrd_recursion_depth;
+       ModelVector<int> thrd_recursion_depth;  // Recursion depth starts from 0 to match with vector indexes.
 
        void init_marker(thread_id_t tid);
 
@@ -94,17 +87,21 @@ private:
        func_inst_list_mt entry_insts;
 
        /* Map a FuncInst to the its predicate when updating predicate trees */
-       ModelVector<inst_pred_map_t *> thrd_inst_pred_map;
+       ModelVector< ModelVector<inst_pred_map_t *> * > thrd_inst_pred_maps;
 
        /* Number FuncInsts to detect loops when updating predicate trees */
-       ModelVector<inst_id_map_t *> thrd_inst_id_map;
+       ModelVector< ModelVector<inst_id_map_t *> *> thrd_inst_id_maps;
 
        /* Detect read actions at the same locations when updating predicate trees */
-       ModelVector<loc_inst_map_t *> thrd_loc_inst_map;
+       ModelVector< ModelVector<loc_inst_map_t *> *> thrd_loc_inst_maps;
 
        void init_local_maps(thread_id_t tid);
        void reset_local_maps(thread_id_t tid);
 
+       void update_inst_tree(func_inst_list_t * inst_list);
+       void update_predicate_tree(ModelAction * act);
+       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, ModelAction * next_act, Predicate ** unset_predicate);
+
        void infer_predicates(FuncInst * next_inst, ModelAction * next_act, 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);
@@ -121,6 +118,9 @@ private:
        /* Keeps track of locations that may share the same value as key, deduced from val_loc_map */
        HashTable<void *, loc_set_t *, uintptr_t, 0> * loc_may_equal_map;
 
+       HashTable<FuncInst *, bool, uintptr_t, 0, model_malloc, model_calloc, model_free> likely_null_set;
+
+       bool likely_reads_from_null(ModelAction * read);
        // value_set_t * values_may_read_from;
 
        /* Run-time position in the predicate tree for each thread
@@ -129,6 +129,8 @@ private:
 
        ModelVector< ModelVector<predicate_trace_t *> * > thrd_predicate_trace;
 
+       void set_predicate_tree_position(thread_id_t tid, Predicate * pred);
+
        void init_predicate_tree_data_structure(thread_id_t tid);
        void reset_predicate_tree_data_structure(thread_id_t tid);