Merge of DPRINTF fixes from head.
--HG-- extra : convert_revision : f99a33b2df6a6c5592856d17d00e73ee83267442
This commit is contained in:
commit
a51e16dc89
4 changed files with 10 additions and 16 deletions
|
@ -452,7 +452,7 @@ TsunamiCChip::postRTC()
|
||||||
if (!(cpumask & itint)) {
|
if (!(cpumask & itint)) {
|
||||||
itint |= cpumask;
|
itint |= cpumask;
|
||||||
tsunami->intrctrl->post(i, TheISA::INTLEVEL_IRQ2, 0);
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -101,8 +101,8 @@ bool
|
||||||
DmaPort::recvTiming(PacketPtr pkt)
|
DmaPort::recvTiming(PacketPtr pkt)
|
||||||
{
|
{
|
||||||
if (pkt->wasNacked()) {
|
if (pkt->wasNacked()) {
|
||||||
DPRINTF(DMA, "Received nacked Pkt %#x with State: %#x Addr: %#x\n",
|
DPRINTF(DMA, "Received nacked %s addr %#x\n",
|
||||||
pkt, pkt->senderState, pkt->getAddr());
|
pkt->cmdString(), pkt->getAddr());
|
||||||
|
|
||||||
if (backoffTime < device->minBackoffDelay)
|
if (backoffTime < device->minBackoffDelay)
|
||||||
backoffTime = device->minBackoffDelay;
|
backoffTime = device->minBackoffDelay;
|
||||||
|
@ -119,8 +119,8 @@ DmaPort::recvTiming(PacketPtr pkt)
|
||||||
DmaReqState *state;
|
DmaReqState *state;
|
||||||
backoffTime >>= 2;
|
backoffTime >>= 2;
|
||||||
|
|
||||||
DPRINTF(DMA, "Received response Pkt %#x with State: %#x Addr: %#x size: %#x\n",
|
DPRINTF(DMA, "Received response %s addr %#x size %#x\n",
|
||||||
pkt, pkt->senderState, pkt->getAddr(), pkt->req->getSize());
|
pkt->cmdString(), pkt->getAddr(), pkt->req->getSize());
|
||||||
state = dynamic_cast<DmaReqState*>(pkt->senderState);
|
state = dynamic_cast<DmaReqState*>(pkt->senderState);
|
||||||
pendingCount--;
|
pendingCount--;
|
||||||
|
|
||||||
|
@ -182,8 +182,8 @@ DmaPort::recvRetry()
|
||||||
PacketPtr pkt = transmitList.front();
|
PacketPtr pkt = transmitList.front();
|
||||||
bool result = true;
|
bool result = true;
|
||||||
do {
|
do {
|
||||||
DPRINTF(DMA, "Retry on Packet %#x with senderState: %#x\n",
|
DPRINTF(DMA, "Retry on %s addr %#x\n",
|
||||||
pkt, pkt->senderState);
|
pkt->cmdString(), pkt->getAddr());
|
||||||
result = sendTiming(pkt);
|
result = sendTiming(pkt);
|
||||||
if (result) {
|
if (result) {
|
||||||
DPRINTF(DMA, "-- Done\n");
|
DPRINTF(DMA, "-- Done\n");
|
||||||
|
@ -267,8 +267,8 @@ DmaPort::sendDma()
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
DPRINTF(DMA, "Attempting to send Packet %#x with addr: %#x\n",
|
DPRINTF(DMA, "Attempting to send %s addr %#x\n",
|
||||||
pkt, pkt->getAddr());
|
pkt->cmdString(), pkt->getAddr());
|
||||||
|
|
||||||
bool result;
|
bool result;
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -208,10 +208,7 @@ Bridge::BridgePort::queueForSendTiming(PacketPtr pkt)
|
||||||
if (buf->expectResponse && pkt->wasNacked())
|
if (buf->expectResponse && pkt->wasNacked())
|
||||||
--outstandingResponses;
|
--outstandingResponses;
|
||||||
|
|
||||||
|
DPRINTF(BusBridge, "response, new dest %d\n", pkt->getDest());
|
||||||
DPRINTF(BusBridge, "restoring sender state: %#X, from packet buffer: %#X\n",
|
|
||||||
pkt->senderState, buf);
|
|
||||||
DPRINTF(BusBridge, " is response, new dest %d\n", pkt->getDest());
|
|
||||||
delete buf;
|
delete buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -224,8 +221,6 @@ Bridge::BridgePort::queueForSendTiming(PacketPtr pkt)
|
||||||
|
|
||||||
Tick readyTime = curTick + delay;
|
Tick readyTime = curTick + delay;
|
||||||
PacketBuffer *buf = new PacketBuffer(pkt, readyTime);
|
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
|
// 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
|
// need to schedule an event to do the transmit. Otherwise there
|
||||||
|
|
|
@ -248,7 +248,6 @@ Bus::recvTiming(PacketPtr pkt)
|
||||||
void
|
void
|
||||||
Bus::recvRetry(int id)
|
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 there's anything waiting, and the bus isn't busy...
|
||||||
if (retryList.size() && curTick >= tickNextIdle) {
|
if (retryList.size() && curTick >= tickNextIdle) {
|
||||||
//retryingPort = retryList.front();
|
//retryingPort = retryList.front();
|
||||||
|
|
Loading…
Reference in a new issue