Fix assertion. I haven't tested it fully (I can't reproduce Lisa's error) but I...

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 32210f1cdfa06a7dd7727294ba168add242b9849..07d4ebb42688326a60e4a8181fe26d6a6c2e7863 100644 (file)
--- 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);