From a50e83c1340de76f61ca8cf16fccb0ba09393580 Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Fri, 13 Oct 2006 17:35:23 -0400
Subject: 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
---
 src/cpu/o3/fetch_impl.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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);
 
-- 
cgit v1.2.3


From 9202422d6ebb7a17936bee1b9aaa427541156d13 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 14 Oct 2006 02:09:05 -0400
Subject: Get rid of unused CacheBlk << output operator.

--HG--
extra : convert_revision : d5c0aadc35edf5c9495afcd3375f1f64716ef845
---
 src/mem/cache/cache_blk.hh | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'src')

diff --git a/src/mem/cache/cache_blk.hh b/src/mem/cache/cache_blk.hh
index a75c9611d..078c82d82 100644
--- a/src/mem/cache/cache_blk.hh
+++ b/src/mem/cache/cache_blk.hh
@@ -38,8 +38,6 @@
 #include "sim/root.hh"		// for Tick
 #include "arch/isa_traits.hh"	// for Addr
 
-#include <iostream>
-
 /**
  * Cache block status bit assignments
  */
@@ -180,21 +178,4 @@ class CacheBlk
 
 };
 
-/**
- * Output a CacheBlk to the given ostream.
- * @param out The stream for the output.
- * @param blk The cache block to print.
- *
- * @return The output stream.
- */
-inline std::ostream &
-operator<<(std::ostream &out, const CacheBlk &blk)
-{
-    out << std::hex << std::endl;
-    out << "  Tag: " << blk.tag << std::endl;
-    out << "  Status: " <<  blk.status << std::endl;
-
-    return(out << std::dec);
-}
-
 #endif //__CACHE_BLK_HH__
-- 
cgit v1.2.3