From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Sat, 14 Jul 2007 19:09:37 +0000 (-0700)
Subject: Merge of DPRINTF fixes from head.
X-Git-Tag: m5_2.0_beta4~195^2~50^2~10
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a51e16dc89ecd24b168fbb4677ca05ab0a7bcc02;p=gem5.git

Merge of DPRINTF fixes from head.

--HG--
extra : convert_revision : f99a33b2df6a6c5592856d17d00e73ee83267442
---

a51e16dc89ecd24b168fbb4677ca05ab0a7bcc02
diff --cc src/dev/io_device.cc
index 806d13d07,be5756ab7..85d78ee8d
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@@ -100,9 -100,11 +100,9 @@@ DmaPort::DmaPort(DmaDevice *dev, Syste
  bool
  DmaPort::recvTiming(PacketPtr pkt)
  {
 -
 -
 -    if (pkt->result == Packet::Nacked) {
 +    if (pkt->wasNacked()) {
-         DPRINTF(DMA, "Received nacked Pkt %#x with State: %#x Addr: %#x\n",
-                pkt, pkt->senderState, pkt->getAddr());
+         DPRINTF(DMA, "Received nacked %s addr %#x\n",
+                 pkt->cmdString(), pkt->getAddr());
  
          if (backoffTime < device->minBackoffDelay)
              backoffTime = device->minBackoffDelay;
diff --cc src/mem/bridge.cc
index 92beb3d7e,8bc32711d..d6adb05d1
--- a/src/mem/bridge.cc
+++ b/src/mem/bridge.cc
@@@ -205,13 -210,10 +205,10 @@@ Bridge::BridgePort::queueForSendTiming(
  
          // Check if this packet was expecting a response and it's a nacked
          // packet, in which case we will never being seeing it
 -        if (buf->expectResponse && pkt->result == Packet::Nacked)
 +        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;
      }