From 0330c434e211c9b16402f4f0e76110a8524ca143 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Fri, 19 Oct 2018 17:58:42 +0200 Subject: mem-cache: Move evictBlock(CacheBlk*, PacketList&) to base Move evictBlock(CacheBlk*, PacketList&) to base cache, as it is both sub-classes implementations are equal. Change-Id: I80fbd16813bfcc4938fb01ed76abe29b3f8b3018 Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/13656 Reviewed-by: Nikos Nikoleris Maintainer: Nikos Nikoleris --- src/mem/cache/cache.cc | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/mem/cache/cache.cc') diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc index fb0eb9d05..3bb2667af 100644 --- a/src/mem/cache/cache.cc +++ b/src/mem/cache/cache.cc @@ -177,7 +177,7 @@ Cache::access(PacketPtr pkt, CacheBlk *&blk, Cycles &lat, // flush and invalidate any existing block CacheBlk *old_blk(tags->findBlock(pkt->getAddr(), pkt->isSecure())); if (old_blk && old_blk->isValid()) { - evictBlock(old_blk, writebacks); + BaseCache::evictBlock(old_blk, writebacks); } blk = nullptr; @@ -848,15 +848,6 @@ Cache::evictBlock(CacheBlk *blk) return pkt; } -void -Cache::evictBlock(CacheBlk *blk, PacketList &writebacks) -{ - PacketPtr pkt = evictBlock(blk); - if (pkt) { - writebacks.push_back(pkt); - } -} - PacketPtr Cache::cleanEvictBlk(CacheBlk *blk) { -- cgit v1.2.3