restructrue code of funcnode.cc, and planning for adding back edges in predicate...

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 367297462ed0c30edd9d493c8152a3e50618916f..58fcc7a01ab77a4078429602cc7ed39b73580fc8 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -20,21 +20,25 @@ public:
        void set_func_id(uint32_t id) { func_id = id; }
        void set_func_name(const char * name) { func_name = name; }
 
-       FuncInst * get_or_add_inst(ModelAction *act);
+       void add_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);
-       void update_inst_tree(action_list_t * act_list);
+
+       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 init_predicate_tree(func_inst_list_t * inst_list);
-       void generate_predicate(FuncInst * func_inst);
+       void update_predicate_tree(func_inst_list_t * inst_list, HashTable<FuncInst *, uint64_t, uintptr_t, 4> * read_val_map);
+       bool follow_branch(Predicate ** curr_pred, FuncInst * next_inst, HashTable<FuncInst *, uint64_t, uintptr_t, 4> * read_val_map, HashTable<void *, FuncInst *, uintptr_t, 4>* loc_inst_map);
+       void print_predicate_tree();
 
        void print_last_read(uint32_t tid);
 
@@ -58,8 +62,10 @@ private:
        /* Store the values read by atomic read actions per memory location for each thread */
        ModelVector<read_map_t *> thrd_read_map;
 
-       /* TODO: how to guarantee unique predicate? Or add an equal function */
-       HashSet<Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> predicate_tree_entry;
+       PredSet predicate_tree_entry;
+
+       /* A FuncInst may correspond to multiple Predicates, so collect them into a PredSet */
+       HashTable<FuncInst *, PredSet *, uintptr_t, 0, model_malloc, model_calloc, model_free> inst_pred_map;
 };
 
 #endif /* __FUNCNODE_H__ */