88,91c88,89
< // locate next cache block
< BlkType *blk = &blks[blkIndex];
< blk->data = &dataBlks[blkSize*blkIndex];
< ++blkIndex;
---
> // Select block within the set to be linked
> BlkType*& blk = sets[i].blks[j];
93,94c91,92
< // invalidate new cache block
< blk->invalidate();
---
> // Locate next cache block
> blk = &blks[blkIndex];
96c94,95
< //EGH Fix Me : do we need to initialize blk?
---
> // Associate a data chunk to the block
> blk->data = &dataBlks[blkSize*blkIndex];
98,99c97,98
< // Setting the tag to j is just to prevent long chains in the hash
< // table; won't matter because the block is invalid
---
> // Setting the tag to j is just to prevent long chains in the
> // hash table; won't matter because the block is invalid
101,103c100,101
< blk->whenReady = 0;
< blk->isTouched = false;
< sets[i].blks[j]=blk;
---
>
> // Set its set and way
105a104,106
>
> // Update block index
> ++blkIndex;