Merge in bus DPRINTF changes.

--HG--
extra : convert_revision : 3bbd7c0745b31bb2a628b604ab1627cd9c61643c

1 files changed, 4 insertions, 7 deletions

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 34084c8dc..92ff4d12e 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -994,6 +994,10 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
         blk->status &= ~bits_to_clear;
     }
 
+    DPRINTF(Cache, "snooped a %s request for addr %x, %snew state is %i\n",
+            pkt->cmdString(), blockAlign(pkt->getAddr()),
+            respond ? "responding, " : "", invalidate ? 0 : blk->status);
+
     if (respond) {
         assert(!pkt->memInhibitAsserted());
         pkt->assertMemInhibit();
@@ -1013,10 +1017,6 @@ Cache<TagStore>::handleSnoop(PacketPtr pkt, BlkType *blk,
     if (invalidate) {
         tags->invalidateBlk(blk);
     }
-
-    DPRINTF(Cache, "snooped a %s request for addr %x, %snew state is %i\n",
-            pkt->cmdString(), blockAlign(pkt->getAddr()),
-            respond ? "responding, " : "", blk->status);
 }
 
 
@@ -1384,9 +1384,6 @@ Cache<TagStore>::MemSidePort::sendPacket()
             MSHR *mshr = dynamic_cast<MSHR*>(pkt->senderState);
 
             bool success = sendTiming(pkt);
-            DPRINTF(CachePort,
-                    "Address %x was %s in sending the timing request\n",
-                    pkt->getAddr(), success ? "successful" : "unsuccessful");
 
             waitingOnRetry = !success;
             if (waitingOnRetry) {