127,134c127,130
< for (unsigned i = 0; i < numSets; ++i) {
< // link in the data blocks
< for (unsigned j = 0; j < assoc; ++j) {
< BlkType *blk = sets[i].blks[j];
< if (blk->isValid())
< cache_state += csprintf("\tset: %d block: %d %s\n", i, j,
< blk->print());
< }
---
> for (const CacheBlk& blk : blks) {
> if (blk.isValid())
> cache_state += csprintf("\tset: %d way: %d %s\n", blk.set,
> blk.way, blk.print());
144,146c140,142
< for (unsigned i = 0; i < numSets*assoc; ++i) {
< if (blks[i].isValid()) {
< totalRefs += blks[i].refCount;
---
> for (const CacheBlk& blk : blks) {
> if (blk.isValid()) {
> totalRefs += blk.refCount;
162,167c158,163
< for (unsigned i = 0; i < numSets * assoc; ++i) {
< if (blks[i].isValid()) {
< assert(blks[i].task_id < ContextSwitchTaskId::NumTaskId);
< occupanciesTaskId[blks[i].task_id]++;
< assert(blks[i].tickInserted <= curTick());
< Tick age = curTick() - blks[i].tickInserted;
---
> for (const CacheBlk& blk : blks) {
> if (blk.isValid()) {
> assert(blk.task_id < ContextSwitchTaskId::NumTaskId);
> occupanciesTaskId[blk.task_id]++;
> assert(blk.tickInserted <= curTick());
> Tick age = curTick() - blk.tickInserted;
181c177
< ageTaskId[blks[i].task_id][age_index]++;
---
> ageTaskId[blk.task_id][age_index]++;