152c152
< void invalidate(BlkType *blk)
---
> void invalidate(CacheBlk *blk)
175c175
< BlkType* accessBlock(Addr addr, bool is_secure, Cycles &lat,
---
> CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat,
215c215
< BlkType* findBlock(Addr addr, bool is_secure) const;
---
> CacheBlk* findBlock(Addr addr, bool is_secure) const;
224c224
< BlkType* findVictim(Addr addr) const
---
> CacheBlk* findVictim(Addr addr)
245c245
< void insertBlock(PacketPtr pkt, BlkType *blk)
---
> void insertBlock(PacketPtr pkt, CacheBlk *blk)
315,324d314
< * Get the block offset from an address.
< * @param addr The address to get the offset of.
< * @return The block offset.
< */
< int extractBlkOffset(Addr addr) const
< {
< return (addr & blkMask);
< }
<
< /**
378,379c368
< template <typename V>
< void forEachBlk(V &visitor) {
---
> void forEachBlk(CacheBlkVisitor &visitor) M5_ATTR_OVERRIDE {