66,67c66,67
< : ClockedObject(p), listeners(), cache(nullptr), blkSize(0), lBlkSize(0),
< system(p->sys), onMiss(p->on_miss), onRead(p->on_read),
---
> : ClockedObject(p), listeners(), cache(nullptr), blkSize(p->block_size),
> lBlkSize(floorLog2(blkSize)), onMiss(p->on_miss), onRead(p->on_read),
69,70c69
< masterId(system->getMasterId(this)),
< pageBytes(system->getPageBytes()),
---
> masterId(p->sys->getMasterId(this)), pageBytes(p->sys->getPageBytes()),
79a79,80
>
> // If the cache has a different block size from the system's, save it
124,127c125
< if (cache->inCache(addr, is_secure)) {
< return true;
< }
< return false;
---
> return cache->inCache(addr, is_secure);
133,136c131
< if (cache->inMissQueue(addr, is_secure)) {
< return true;
< }
< return false;
---
> return cache->inMissQueue(addr, is_secure);