projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
114d3fe
)
Bug fix
author
bdemsky
<bdemsky@uci.edu>
Wed, 22 Jul 2020 18:44:20 +0000
(11:44 -0700)
committer
bdemsky
<bdemsky@uci.edu>
Wed, 22 Jul 2020 18:44:20 +0000
(11:44 -0700)
execution.cc
patch
|
blob
|
history
diff --git
a/execution.cc
b/execution.cc
index ce9fa35b68a527fa9f2a193d9ebbc172698c9781..53b6bccf790df471600a8f555f1ed17249a72443 100644
(file)
--- a/
execution.cc
+++ b/
execution.cc
@@
-1198,8
+1198,12
@@
ClockVector * ModelExecution::get_hb_from_write(ModelAction *rf) const {
else
(vec=new ClockVector(vec, NULL))->merge(rf->get_last_fence_release()->get_cv());
} else {
- if (vec == NULL && rf->is_rmw()) {
- vec = new ClockVector(NULL, NULL);
+ if (vec == NULL) {
+ if (rf->is_rmw()) {
+ vec = new ClockVector(NULL, NULL);
+ }
+ } else {
+ vec = new ClockVector(vec, NULL);
}
}
rf->set_rfcv(vec);