projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
experiment with generating equality predicates across memory locations; it seems...
[c11tester.git]
/
history.h
diff --git
a/history.h
b/history.h
index ee07f993458363041a6c30326d76ef5eb9e0af43..3bb615640eca3e86728675db2c366c508689d4d4 100644
(file)
--- a/
history.h
+++ b/
history.h
@@
-7,8
+7,6
@@
#include "hashset.h"
#include "threads-model.h"
#include "hashset.h"
#include "threads-model.h"
-typedef HashSet<uint64_t, uint64_t, 0, model_malloc, model_calloc, model_free> write_set_t;
-
class ModelHistory {
public:
ModelHistory();
class ModelHistory {
public:
ModelHistory();
@@
-28,11
+26,15
@@
public:
ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
FuncNode * get_func_node(uint32_t func_id);
ModelVector<FuncNode *> * getFuncNodes() { return &func_nodes; }
FuncNode * get_func_node(uint32_t func_id);
-
uint64_t query_last_read(void * location, thread_id_t tid);
+
//
uint64_t query_last_read(void * location, thread_id_t tid);
void add_to_write_history(void * location, uint64_t write_val);
void add_to_write_history(void * location, uint64_t write_val);
+ HashTable<void *, value_set_t *, uintptr_t, 4> * getWriteHistory() { return &write_history; }
+ void add_to_loc_func_nodes_map(void * location, FuncNode * node);
- void print();
+ void set_new_exec_flag();
+ void print_write();
+ void print_func_node();
MEMALLOC
private:
MEMALLOC
private:
@@
-40,11
+42,14
@@
private:
/* map function names to integer ids */
HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
/* map function names to integer ids */
HashTable<const char *, uint32_t, uintptr_t, 4, model_malloc, model_calloc, model_free> func_map;
+
/* map integer ids to function names */
ModelVector<const char *> func_map_rev;
ModelVector<FuncNode *> func_nodes;
/* map integer ids to function names */
ModelVector<const char *> func_map_rev;
ModelVector<FuncNode *> func_nodes;
- HashTable<void *, write_set_t *, uintptr_t, 4, model_malloc, model_calloc, model_free> write_history;
+
+ HashTable<void *, value_set_t *, uintptr_t, 4> write_history;
+ HashTable<void *, SnapList<FuncNode *> *, uintptr_t, 4> loc_func_nodes_map;
};
#endif /* __HISTORY_H__ */
};
#endif /* __HISTORY_H__ */