experiment with adding NULLITY predicate

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index bfb3fac767eeedd6ef8e570c736c6193119fd74c..730a7b7cc22a50767d1df5d4563b90d84ec46973 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -36,8 +36,9 @@ public:
        void clear_read_map(uint32_t tid);
 
        /* TODO: generate EQUALITY or NULLITY predicate based on write_history in history.cc */
-       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 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<void *, ModelAction *, uintptr_t, 0>* loc_act_map);
        void print_predicate_tree();
 
        void print_last_read(uint32_t tid);
@@ -62,7 +63,6 @@ private:
 
        /* Store the values read by atomic read actions per memory location for each thread */
        ModelVector<read_map_t *> thrd_read_map;
-       HashTable<FuncInst *, Predicate *, uintptr_t, 0, model_malloc, model_calloc, model_free> predicate_tree_backedges;
 };
 
 #endif /* __FUNCNODE_H__ */