projects
/
gem5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
974a776
)
O3: Remove assertion for case that is actually handled in code.
author
Ali Saidi
<Ali.Saidi@ARM.com>
Thu, 5 May 2011 01:38:27 +0000
(20:38 -0500)
committer
Ali Saidi
<Ali.Saidi@ARM.com>
Thu, 5 May 2011 01:38:27 +0000
(20:38 -0500)
If an nonspeculative instruction has a fault it might not be in the
nonSpecInsts map.
src/cpu/o3/inst_queue_impl.hh
patch
|
blob
|
history
diff --git
a/src/cpu/o3/inst_queue_impl.hh
b/src/cpu/o3/inst_queue_impl.hh
index 8592cd6b19269efe36d19669d4242bb1c840abf4..09e925e1dd78c050ec5b26fdf411ff315b676727 100644
(file)
--- a/
src/cpu/o3/inst_queue_impl.hh
+++ b/
src/cpu/o3/inst_queue_impl.hh
@@
-1199,7
+1199,7
@@
InstructionQueue<Impl>::doSquash(ThreadID tid)
!squashed_inst->isCompleted()) {
NonSpecMapIt ns_inst_it =
nonSpecInsts.find(squashed_inst->seqNum);
- assert(ns_inst_it != nonSpecInsts.end());
+
if (ns_inst_it == nonSpecInsts.end()) {
assert(squashed_inst->getFault() != NoFault);
} else {