experiment with adding NULLITY predicate

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 6ddcbb26d328859ddc2a8a42716ecee5ff935958..730a7b7cc22a50767d1df5d4563b90d84ec46973 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -1,46 +1,68 @@
+#ifndef __FUNCNODE_H__
+#define __FUNCNODE_H__
+
 #include "action.h"
+#include "funcinst.h"
 #include "hashtable.h"
+#include "hashset.h"
+#include "predicate.h"
 
-class ModelAction;
-
-typedef ModelList<FuncInst *> func_inst_list_t;
-
-class FuncInst {
-public:
-       FuncInst(ModelAction *act);
-       ~FuncInst();
-
-       //ModelAction * get_action() const { return action; }
-       const char * get_position() const { return position; }
-       void * get_location() const { return location; }
-       action_type get_type() const { return type; }
-
-       MEMALLOC
-private:
-       //ModelAction * const action;
-       const char * position;
-       void *location;
-       action_type type;
-};
+typedef ModelList<FuncInst *> func_inst_list_mt;
+typedef HashTable<void *, uint64_t, uintptr_t, 4, model_malloc, model_calloc, model_free> read_map_t;
 
 class FuncNode {
 public:
        FuncNode();
        ~FuncNode();
 
-       void add_action(ModelAction *act);
+       uint32_t get_func_id() { return func_id; }
+       const char * get_func_name() { return func_name; }
+       void set_func_id(uint32_t id) { func_id = id; }
+       void set_func_name(const char * name) { func_name = name; }
 
-       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> * getFuncInsts() { return &func_insts; }
-       func_inst_list_t * get_inst_list() { return &inst_list; }
+       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_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<void *, ModelAction *, uintptr_t, 0>* loc_act_map);
+       void print_predicate_tree();
+
+       void print_last_read(uint32_t tid);
 
        MEMALLOC
 private:
-       /* Use source line number as the key of hashtable
-        *
-        * To do: cds_atomic_compare_exchange contains three atomic operations
-        * that are feeded with the same source line number by llvm pass
+       uint32_t func_id;
+       const char * func_name;
+       bool predicate_tree_initialized;
+       Predicate * predicate_tree_entry;       // a dummy node whose children are the real entries
+
+       /* Use source line number as the key of hashtable, to check if
+        * atomic operation with this line number has been added or not
         */
-       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_insts;
+       HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_inst_map;
+
+       /* list of all atomic actions in this function */
+       func_inst_list_mt inst_list;
 
-       func_inst_list_t inst_list;
+       /* 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;
 };
+
+#endif /* __FUNCNODE_H__ */