177c177
< void invalidate(BlkType *blk);
---
> void invalidate(CacheBlk *blk);
191,192c191,192
< FALRUBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat,
< int context_src, int *inCache = 0);
---
> CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat,
> int context_src, int *inCache);
194a195,200
> * Just a wrapper of above function to conform with the base interface.
> */
> CacheBlk* accessBlock(Addr addr, bool is_secure, Cycles &lat,
> int context_src);
>
> /**
201c207
< FALRUBlk* findBlock(Addr addr, bool is_secure) const;
---
> CacheBlk* findBlock(Addr addr, bool is_secure) const;
208c214
< FALRUBlk* findVictim(Addr addr);
---
> CacheBlk* findVictim(Addr addr);
210c216
< void insertBlock(PacketPtr pkt, BlkType *blk);
---
> void insertBlock(PacketPtr pkt, CacheBlk *blk);
264,273d269
< * Calculate the block offset of an address.
< * @param addr the address to get the offset of.
< * @return the block offset.
< */
< int extractBlkOffset(Addr addr) const
< {
< return (addr & (Addr)(blkSize-1));
< }
<
< /**
279c275
< Addr regenerateBlkAddr(Addr tag, int set) const
---
> Addr regenerateBlkAddr(Addr tag, unsigned set) const
307,308c303
< template <typename V>
< void forEachBlk(V &visitor) {
---
> void forEachBlk(CacheBlkVisitor &visitor) M5_ATTR_OVERRIDE {