diff -r dc270e418d30 -r 260a11fedfa5 src/mem/coherent_bus.cc --- a/src/mem/coherent_bus.cc Mon Apr 22 23:38:27 2013 +0100 +++ b/src/mem/coherent_bus.cc Mon Apr 22 23:38:33 2013 +0100 @@ -199,7 +199,7 @@ // update the bus state and schedule an idle event reqLayer.failedTiming(src_port, master_port_id, - clockEdge(Cycles(headerCycles))); + clockEdge(headerCycles)); } else { // update the bus state and schedule an idle event reqLayer.succeededTiming(packetFinishTime); @@ -223,9 +223,12 @@ // determine the source port based on the id MasterPort *src_port = masterPorts[master_port_id]; + // determine the destination based on what is stored in the packet + PortID slave_port_id = pkt->getDest(); + // test if the bus should be considered occupied for the current // port - if (!respLayer.tryTiming(src_port, pkt->getDest())) { + if (!respLayer.tryTiming(src_port, slave_port_id)) { DPRINTF(CoherentBus, "recvTimingResp: src %s %s 0x%x BUSY\n", src_port->name(), pkt->cmdString(), pkt->getAddr()); return false; @@ -249,9 +252,6 @@ // remove it as outstanding outstandingReq.erase(pkt->req); - // determine the destination based on what is stored in the packet - PortID slave_port_id = pkt->getDest(); - // send the packet through the destination slave port bool success M5_VAR_USED = slavePorts[slave_port_id]->sendTimingResp(pkt); diff -r dc270e418d30 -r 260a11fedfa5 src/mem/noncoherent_bus.cc --- a/src/mem/noncoherent_bus.cc Mon Apr 22 23:38:27 2013 +0100 +++ b/src/mem/noncoherent_bus.cc Mon Apr 22 23:38:33 2013 +0100 @@ -138,7 +138,7 @@ // occupy until the header is sent reqLayer.failedTiming(src_port, master_port_id, - clockEdge(Cycles(headerCycles))); + clockEdge(headerCycles)); return false; } @@ -160,9 +160,12 @@ // determine the source port based on the id MasterPort *src_port = masterPorts[master_port_id]; + // determine the destination based on what is stored in the packet + PortID slave_port_id = pkt->getDest(); + // test if the bus should be considered occupied for the current // port - if (!respLayer.tryTiming(src_port, pkt->getDest())) { + if (!respLayer.tryTiming(src_port, slave_port_id)) { DPRINTF(NoncoherentBus, "recvTimingResp: src %s %s 0x%x BUSY\n", src_port->name(), pkt->cmdString(), pkt->getAddr()); return false; @@ -179,11 +182,8 @@ calcPacketTiming(pkt); Tick packetFinishTime = pkt->busLastWordDelay + curTick(); - // determine the destination based on what is stored in the packet - PortID slave_port_id = pkt->getDest(); - // send the packet through the destination slave port - bool success M5_VAR_USED = slavePorts[pkt->getDest()]->sendTimingResp(pkt); + bool success M5_VAR_USED = slavePorts[slave_port_id]->sendTimingResp(pkt); // currently it is illegal to block responses... can lead to // deadlock