projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add new option for uninitialized writes...
[model-checker.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index a2cb93d7ca702217be5af879cbf0c2ba34f9a67e..25401d9a3d349d07f6c4b11fe4a140e041f82394 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-53,8
+53,7
@@
class CycleGraph {
void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
#endif
void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
#endif
- bool resolvePromise(const Promise *promise, ModelAction *writer,
- promise_list_t *mustResolve);
+ bool resolvePromise(const Promise *promise, ModelAction *writer);
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private:
@@
-66,10
+65,11
@@
class CycleGraph {
CycleNode * getNode(const Promise *promise);
CycleNode * getNode_noCreate(const ModelAction *act) const;
CycleNode * getNode_noCreate(const Promise *promise) const;
CycleNode * getNode(const Promise *promise);
CycleNode * getNode_noCreate(const ModelAction *act) const;
CycleNode * getNode_noCreate(const Promise *promise) const;
- bool mergeNodes(CycleNode *node1, CycleNode *node2,
- promise_list_t *mustMerge);
+ bool mergeNodes(CycleNode *node1, CycleNode *node2);
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
+ std::vector< const CycleNode *, ModelAlloc<const CycleNode *> > * queue;
+
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;