From 2f17062dd9a465943b57723f72f89ec66a0db664 Mon Sep 17 00:00:00 2001 From: Robert Kovacsics Date: Thu, 19 Jul 2018 18:56:06 +0100 Subject: 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 and Queue - 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 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- src/mem/packet_queue.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mem/packet_queue.cc') diff --git a/src/mem/packet_queue.cc b/src/mem/packet_queue.cc index a630f1f5f..7aa2fc1f9 100644 --- a/src/mem/packet_queue.cc +++ b/src/mem/packet_queue.cc @@ -82,7 +82,7 @@ PacketQueue::hasAddr(Addr addr) const } bool -PacketQueue::checkFunctional(PacketPtr pkt) +PacketQueue::trySatisfyFunctional(PacketPtr pkt) { pkt->pushLabel(label); @@ -92,7 +92,7 @@ PacketQueue::checkFunctional(PacketPtr pkt) while (!found && i != transmitList.end()) { // If the buffered packet contains data, and it overlaps the // current packet, then update data - found = pkt->checkFunctional(i->pkt); + found = pkt->trySatisfyFunctional(i->pkt); ++i; } -- cgit v1.2.3