From: Kevin Lim <ktlim@umich.edu>
Date: Fri, 13 Oct 2006 21:35:23 +0000 (-0400)
Subject: Fix assertion.  I haven't tested it fully (I can't reproduce Lisa's error) but I... 
X-Git-Tag: m5_2.0_beta2~90^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a50e83c1340de76f61ca8cf16fccb0ba09393580;p=gem5.git

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
---

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);