cpu, dev, mem: Use the new Port methods.

Use getPeer, takeOverFrom, and << to simplify the use of ports in some
areas.

Change-Id: Idfbda27411b5d6b742f5e4927894302ea6d6a53d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20235
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
This commit is contained in:
Gabe Black
2019-08-16 23:21:56 -07:00
parent f4f31b261c
commit 4d503eeffe
6 changed files with 24 additions and 78 deletions

View File

@@ -80,8 +80,7 @@ void
SMMUv3SlaveInterface::sendRange()
{
if (slavePort->isConnected()) {
inform("Slave port is connected to %d\n",
slavePort->getMasterPort().name());
inform("Slave port is connected to %s\n", slavePort->getPeer());
slavePort->sendRangeChange();
} else {
@@ -124,8 +123,7 @@ Tick
SMMUv3SlaveInterface::recvAtomic(PacketPtr pkt)
{
DPRINTF(SMMUv3, "[a] req from %s addr=%#x size=%#x\n",
slavePort->getMasterPort().name(),
pkt->getAddr(), pkt->getSize());
slavePort->getPeer(), pkt->getAddr(), pkt->getSize());
std::string proc_name = csprintf("%s.port", name());
SMMUTranslationProcess proc(proc_name, *smmu, *this);
@@ -141,8 +139,7 @@ bool
SMMUv3SlaveInterface::recvTimingReq(PacketPtr pkt)
{
DPRINTF(SMMUv3, "[t] req from %s addr=%#x size=%#x\n",
slavePort->getMasterPort().name(),
pkt->getAddr(), pkt->getSize());
slavePort->getPeer(), pkt->getAddr(), pkt->getSize());
// @todo: We need to pay for this and not just zero it out
pkt->headerDelay = pkt->payloadDelay = 0;