summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-07-14 12:09:37 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2007-07-14 12:09:37 -0700
commita51e16dc89ecd24b168fbb4677ca05ab0a7bcc02 (patch)
treec34251dba54e0d5fd03532279df48e416b74ce0d /src
parentb4178269dfc87c49718c005cb7e345d004b453dd (diff)
parent7cd6c7ee05b45b578fe20077bce53dd95dd5e7b4 (diff)
downloadgem5-a51e16dc89ecd24b168fbb4677ca05ab0a7bcc02.tar.xz
Merge of DPRINTF fixes from head.
--HG-- extra : convert_revision : f99a33b2df6a6c5592856d17d00e73ee83267442
Diffstat (limited to 'src')
-rw-r--r--src/dev/alpha/tsunami_cchip.cc2
-rw-r--r--src/dev/io_device.cc16
-rw-r--r--src/mem/bridge.cc7
-rw-r--r--src/mem/bus.cc1
4 files changed, 10 insertions, 16 deletions
diff --git a/src/dev/alpha/tsunami_cchip.cc b/src/dev/alpha/tsunami_cchip.cc
index a7175d90c..c10ca1eef 100644
--- a/src/dev/alpha/tsunami_cchip.cc
+++ b/src/dev/alpha/tsunami_cchip.cc
@@ -452,7 +452,7 @@ TsunamiCChip::postRTC()
if (!(cpumask & itint)) {
itint |= cpumask;
tsunami->intrctrl->post(i, TheISA::INTLEVEL_IRQ2, 0);
- DPRINTF(Tsunami, "Posting RTC interrupt to cpu=%d", i);
+ DPRINTF(Tsunami, "Posting RTC interrupt to cpu=%d\n", i);
}
}
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index 806d13d07..85d78ee8d 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -101,8 +101,8 @@ bool
DmaPort::recvTiming(PacketPtr pkt)
{
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;
@@ -119,8 +119,8 @@ DmaPort::recvTiming(PacketPtr pkt)
DmaReqState *state;
backoffTime >>= 2;
- DPRINTF(DMA, "Received response Pkt %#x with State: %#x Addr: %#x size: %#x\n",
- pkt, pkt->senderState, pkt->getAddr(), pkt->req->getSize());
+ DPRINTF(DMA, "Received response %s addr %#x size %#x\n",
+ pkt->cmdString(), pkt->getAddr(), pkt->req->getSize());
state = dynamic_cast<DmaReqState*>(pkt->senderState);
pendingCount--;
@@ -182,8 +182,8 @@ DmaPort::recvRetry()
PacketPtr pkt = transmitList.front();
bool result = true;
do {
- DPRINTF(DMA, "Retry on Packet %#x with senderState: %#x\n",
- pkt, pkt->senderState);
+ DPRINTF(DMA, "Retry on %s addr %#x\n",
+ pkt->cmdString(), pkt->getAddr());
result = sendTiming(pkt);
if (result) {
DPRINTF(DMA, "-- Done\n");
@@ -267,8 +267,8 @@ DmaPort::sendDma()
return;
}
- DPRINTF(DMA, "Attempting to send Packet %#x with addr: %#x\n",
- pkt, pkt->getAddr());
+ DPRINTF(DMA, "Attempting to send %s addr %#x\n",
+ pkt->cmdString(), pkt->getAddr());
bool result;
do {
diff --git a/src/mem/bridge.cc b/src/mem/bridge.cc
index 92beb3d7e..d6adb05d1 100644
--- a/src/mem/bridge.cc
+++ b/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
diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 34f7f4fd0..0cb1240f3 100644
--- a/src/mem/bus.cc
+++ b/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();