summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2006-10-17 14:05:23 -0400
committerRon Dreslinski <rdreslin@umich.edu>2006-10-17 14:05:23 -0400
commit685e588b4508c737a001855abef2512c5703a373 (patch)
tree831a9293e0d6feefe4023e7a885055e3ee539487 /src
parent1871495b8d16acdd0173be0acbff328c8fe97ea0 (diff)
parent9202422d6ebb7a17936bee1b9aaa427541156d13 (diff)
downloadgem5-685e588b4508c737a001855abef2512c5703a373.tar.xz
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest --HG-- extra : convert_revision : c3650273684f3fbdcd2e14e95d09ee3c6de8d6b6
Diffstat (limited to 'src')
-rw-r--r--src/cpu/o3/fetch_impl.hh2
-rw-r--r--src/mem/cache/cache_blk.hh19
2 files changed, 1 insertions, 20 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);
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__