projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11349f4
)
Bug fixes to atomic logic
author
root
<root@dw-6.eecs.uci.edu>
Thu, 25 Jul 2019 20:59:59 +0000
(13:59 -0700)
committer
root
<root@dw-6.eecs.uci.edu>
Thu, 25 Jul 2019 20:59:59 +0000
(13:59 -0700)
execution.cc
patch
|
blob
|
history
diff --git
a/execution.cc
b/execution.cc
index 0710dd6b68b26364591bbc6fa38b92db875c91ba..af54b54a54cc43e962c8606115eb10be467ddffa 100644
(file)
--- a/
execution.cc
+++ b/
execution.cc
@@
-596,8
+596,8
@@
bool ModelExecution::process_fence(ModelAction *curr)
continue;
/* Establish hypothetical release sequences */
continue;
/* Establish hypothetical release sequences */
- ClockVector *cv = get_hb_from_write(act);
- if (curr->get_cv()->merge(cv))
+ ClockVector *cv = get_hb_from_write(act
->get_reads_from()
);
+ if (c
v != NULL && c
urr->get_cv()->merge(cv))
updated = true;
}
}
updated = true;
}
}
@@
-987,7
+987,7
@@
bool ModelExecution::r_modification_order(ModelAction *curr, const ModelAction *
if (act->happens_before(curr)) {
if (i==0) {
if (last_sc_fence_local == NULL ||
if (act->happens_before(curr)) {
if (i==0) {
if (last_sc_fence_local == NULL ||
- (*last_sc_fence_local < *
prev_same_thread
)) {
+ (*last_sc_fence_local < *
act
)) {
prev_same_thread = act;
}
}
prev_same_thread = act;
}
}