94a95,97
> // Set its index
> sec_blk->setPosition(i, j);
>
113,115c116,117
< // Set its set, way and sector offset
< blk->set = i;
< blk->way = j;
---
> // Set its index and sector offset
> blk->setPosition(i, j);
311,312c313,314
< DPRINTF(CacheRepl, "set %x, way %x, sector offset %x: %s\n",
< "selecting blk for replacement\n", victim->set, victim->way,
---
> DPRINTF(CacheRepl, "set %x, way %x, sector offset %x: selecting blk " \
> "for replacement\n", victim->getSet(), victim->getWay(),
340c342,343
< return ((blk_cast->getTag() << tagShift) | ((Addr)blk->set << setShift) |
---
> const Addr set = blk_cast->getSectorBlock()->getSet() << setShift;
> return ((blk_cast->getTag() << tagShift) | set |