Merge of DPRINTF fixes from head.

--HG--
extra : convert_revision : f99a33b2df6a6c5592856d17d00e73ee83267442

src/mem/bridge.cc

@@ -208,10 +208,7 @@ Bridge::BridgePort::queueForSendTiming(PacketPtr pkt)
         if (buf->expectResponse && pkt->wasNacked())
             --outstandingResponses;
 
-
-        DPRINTF(BusBridge, "restoring  sender state: %#X, from packet buffer: %#X\n",
-                        pkt->senderState, buf);
-        DPRINTF(BusBridge, "  is response, new dest %d\n", pkt->getDest());
+        DPRINTF(BusBridge, "response, new dest %d\n", pkt->getDest());
         delete buf;
     }
 
@@ -224,8 +221,6 @@ Bridge::BridgePort::queueForSendTiming(PacketPtr pkt)
 
     Tick readyTime = curTick + delay;
     PacketBuffer *buf = new PacketBuffer(pkt, readyTime);
-    DPRINTF(BusBridge, "old sender state: %#X, new sender state: %#X\n",
-            buf->origSenderState, buf);
 
     // If we're about to put this packet at the head of the queue, we
     // need to schedule an event to do the transmit.  Otherwise there

src/mem/bus.cc

@@ -248,7 +248,6 @@ Bus::recvTiming(PacketPtr pkt)
 void
 Bus::recvRetry(int id)
 {
-    DPRINTF(Bus, "Received a retry from %s\n", id == -1 ? "self" : interfaces[id]->getPeer()->name());
     // If there's anything waiting, and the bus isn't busy...
     if (retryList.size() && curTick >= tickNextIdle) {
         //retryingPort = retryList.front();