mem-cache: Remove extra block init in BaseSetAssoc
Removed extra initialization of cache block just after they have been
created and organized the comments.
Change-Id: I75c1beaf0489e3e530fd8cbff2739dc7593e3e6f
Reviewed-on: https://gem5-review.googlesource.com/8661
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
diff --git a/src/mem/cache/tags/base_set_assoc.cc b/src/mem/cache/tags/base_set_assoc.cc
index 728f5a5..61764fe 100644
--- a/src/mem/cache/tags/base_set_assoc.cc
+++ b/src/mem/cache/tags/base_set_assoc.cc
@@ -85,24 +85,25 @@
// link in the data blocks
for (unsigned j = 0; j < assoc; ++j) {
- // locate next cache block
- BlkType *blk = &blks[blkIndex];
+ // Select block within the set to be linked
+ BlkType*& blk = sets[i].blks[j];
+
+ // Locate next cache block
+ blk = &blks[blkIndex];
+
+ // Associate a data chunk to the block
blk->data = &dataBlks[blkSize*blkIndex];
- ++blkIndex;
- // invalidate new cache block
- blk->invalidate();
-
- //EGH Fix Me : do we need to initialize blk?
-
- // 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
blk->tag = j;
- blk->whenReady = 0;
- blk->isTouched = false;
- sets[i].blks[j]=blk;
+
+ // Set its set and way
blk->set = i;
blk->way = j;
+
+ // Update block index
+ ++blkIndex;
}
}
}
