240c240
< victim->set, victim->way);
---
> victim->getSet(), victim->getWay());
305c305,306
< return ((blk->tag << tagShift) | ((Addr)blk->set << setShift));
---
> const Addr set = blk->getSet() << setShift;
> return ((blk->tag << tagShift) | set);