summaryrefslogtreecommitdiff
path: root/src/mem/mem_delay.cc
diff options
context:
space:
mode:
authorRobert Kovacsics <rmk35@cl.cam.ac.uk>2018-07-19 18:56:06 +0100
committerKovacsics RĂ³bert <kovirobi@gmail.com>2018-07-23 11:57:50 +0000
commit2f17062dd9a465943b57723f72f89ec66a0db664 (patch)
treeb1b017079a912021b892e159572e3d8055181b66 /src/mem/mem_delay.cc
parent4158138d1f0ef14b7be2f55382836821b7ac09d5 (diff)
downloadgem5-2f17062dd9a465943b57723f72f89ec66a0db664.tar.xz
mem: Rename Packet::checkFunctional to trySatisfyFunctional
Packet::checkFunctional also wrote data to/from the packet depending on if it was read/write, respectively, which the 'check' in the name would suggest otherwise. This renames it to doFunctional, which is more suggestive. It also renames any function called checkFunctional which calls Packet::checkFunctional. These are - Bridge::BridgeMasterPort::checkFunctional - calls Packet::checkFunctional - MSHR::checkFunctional - calls Packet::checkFunctional - MSHR::TargetList::checkFunctional - calls Packet::checkFunctional - Queue<>::checkFunctional (of src/mem/cache/queue.hh, not src/cpu/minor/buffers.h) - Instantiated with Queue<WriteQueueEntry> and Queue<MSHR> - WriteQueueEntry - calls Packet::checkFunctional - WriteQueueEntry::TargetList - calls Packet::checkFunctional - MemDelay::checkFunctional - calls QueuedSlavePort/QueuedMasterPort::checkFunctional - Packet::checkFunctional - PacketQueue::checkFunctional - calls Packet::checkFunctional - QueuedSlavePort::checkFunctional - calls PacketQueue::doFunctional - QueuedMasterPort::checkFunctional - calls PacketQueue::doFunctional - SerialLink::SerialLinkMasterPort::checkFunctional - calls Packet::doFunctional Change-Id: Ieca2579c020c329040da053ba8e25820801b62c5 Reviewed-on: https://gem5-review.googlesource.com/11810 Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/mem/mem_delay.cc')
-rw-r--r--src/mem/mem_delay.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mem/mem_delay.cc b/src/mem/mem_delay.cc
index 4a682f3bc..b3c89d2a3 100644
--- a/src/mem/mem_delay.cc
+++ b/src/mem/mem_delay.cc
@@ -81,10 +81,10 @@ MemDelay::getSlavePort(const std::string& if_name, PortID idx)
}
bool
-MemDelay::checkFunctional(PacketPtr pkt)
+MemDelay::trySatisfyFunctional(PacketPtr pkt)
{
- return slavePort.checkFunctional(pkt) ||
- masterPort.checkFunctional(pkt);
+ return slavePort.trySatisfyFunctional(pkt) ||
+ masterPort.trySatisfyFunctional(pkt);
}
MemDelay::MasterPort::MasterPort(const std::string &_name, MemDelay &_parent)
@@ -107,7 +107,7 @@ MemDelay::MasterPort::recvTimingResp(PacketPtr pkt)
void
MemDelay::MasterPort::recvFunctionalSnoop(PacketPtr pkt)
{
- if (parent.checkFunctional(pkt)) {
+ if (parent.trySatisfyFunctional(pkt)) {
pkt->makeResponse();
} else {
parent.slavePort.sendFunctionalSnoop(pkt);
@@ -156,7 +156,7 @@ MemDelay::SlavePort::recvTimingReq(PacketPtr pkt)
void
MemDelay::SlavePort::recvFunctional(PacketPtr pkt)
{
- if (parent.checkFunctional(pkt)) {
+ if (parent.trySatisfyFunctional(pkt)) {
pkt->makeResponse();
} else {
parent.masterPort.sendFunctional(pkt);