diff options
| -rw-r--r-- | src/mem/cache/base.cc | 4 | ||||
| -rw-r--r-- | src/mem/cache/queue.hh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc index 2a6bc2a56..70e7ba186 100644 --- a/src/mem/cache/base.cc +++ b/src/mem/cache/base.cc @@ -649,8 +649,8 @@ BaseCache::functionalAccess(PacketPtr pkt, bool from_cpu_side) bool done = have_dirty || cpuSidePort.trySatisfyFunctional(pkt) || - mshrQueue.trySatisfyFunctional(pkt, blk_addr) || - writeBuffer.trySatisfyFunctional(pkt, blk_addr) || + mshrQueue.trySatisfyFunctional(pkt) || + writeBuffer.trySatisfyFunctional(pkt) || memSidePort.trySatisfyFunctional(pkt); DPRINTF(CacheVerbose, "%s: %s %s%s%s\n", __func__, pkt->print(), diff --git a/src/mem/cache/queue.hh b/src/mem/cache/queue.hh index 30fe4bad6..c75894a76 100644 --- a/src/mem/cache/queue.hh +++ b/src/mem/cache/queue.hh @@ -181,11 +181,11 @@ class Queue : public Drainable return nullptr; } - bool trySatisfyFunctional(PacketPtr pkt, Addr blk_addr) + bool trySatisfyFunctional(PacketPtr pkt) { pkt->pushLabel(label); for (const auto& entry : allocatedList) { - if (entry->matchBlockAddr(blk_addr, pkt->isSecure()) && + if (entry->matchBlockAddr(pkt) && entry->trySatisfyFunctional(pkt)) { pkt->popLabel(); return true; |