summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-10-13 17:35:23 -0400
committerKevin Lim <ktlim@umich.edu>2006-10-13 17:35:23 -0400
commita50e83c1340de76f61ca8cf16fccb0ba09393580 (patch)
treea2b43c6e804729b63e4ccebe216d3a0753f4c912 /src/cpu
parentca4063ac00202b80e11312be62abbe4283cfae7b (diff)
downloadgem5-a50e83c1340de76f61ca8cf16fccb0ba09393580.tar.xz
Fix assertion. I haven't tested it fully (I can't reproduce Lisa's error) but I believe it should fix what she's running into (which was definitely a bug).
src/cpu/o3/fetch_impl.hh: Move assertion to area where it should really always be true. Sometimes you might recvRetry and not necessarily be blocked (if there was a squash). --HG-- extra : convert_revision : 76ad35357e7f4c44fa544ffed071096a62053018
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/o3/fetch_impl.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 32210f1cd..07d4ebb42 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -1285,8 +1285,8 @@ template<class Impl>
void
DefaultFetch<Impl>::recvRetry()
{
- assert(cacheBlocked);
if (retryPkt != NULL) {
+ assert(cacheBlocked);
assert(retryTid != -1);
assert(fetchStatus[retryTid] == IcacheWaitRetry);