mem-cache: Rename the tag class init function to tagsInit.
Since the tag classes are subclasses of SimObject, they inherit an
init function which does generic initialization at simulation startup
and which doesn't take any parameters. A new function was added which
does take a parameter, and which is just for doing tag specific
initialization as triggered by the base cache. These two names clashed,
and clang complained that the tag local name was hiding the SimObject
name (which it was).
Change-Id: I399775aceaf8f1a8e2646d434facef22e6d3e7d0
Reviewed-on: https://gem5-review.googlesource.com/c/13875
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
diff --git a/src/mem/cache/base.cc b/src/mem/cache/base.cc
index a7c2106..8f7a892 100644
--- a/src/mem/cache/base.cc
+++ b/src/mem/cache/base.cc
@@ -118,7 +118,7 @@
tempBlock = new TempCacheBlk(blkSize);
- tags->init(this);
+ tags->tagsInit(this);
if (prefetcher)
prefetcher->setCache(this);
}
diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh
index 257b1bd..a7a35ff 100644
--- a/src/mem/cache/tags/base.hh
+++ b/src/mem/cache/tags/base.hh
@@ -179,7 +179,7 @@
*
* @param _cache Pointer to parent cache.
*/
- virtual void init(BaseCache *_cache) = 0;
+ virtual void tagsInit(BaseCache *_cache) = 0;
/**
* Register local statistics.
diff --git a/src/mem/cache/tags/base_set_assoc.cc b/src/mem/cache/tags/base_set_assoc.cc
index 74fb247..b3b7731 100644
--- a/src/mem/cache/tags/base_set_assoc.cc
+++ b/src/mem/cache/tags/base_set_assoc.cc
@@ -63,7 +63,7 @@
}
void
-BaseSetAssoc::init(BaseCache* cache)
+BaseSetAssoc::tagsInit(BaseCache* cache)
{
// Set parent cache
setCache(cache);
diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh
index 70e9071..58aceb0 100644
--- a/src/mem/cache/tags/base_set_assoc.hh
+++ b/src/mem/cache/tags/base_set_assoc.hh
@@ -103,7 +103,7 @@
*
* @param _cache Pointer to parent cache.
*/
- void init(BaseCache *_cache) override;
+ void tagsInit(BaseCache *_cache) override;
/**
* This function updates the tags when a block is invalidated. It also
diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc
index 01f0aa2..2c92a94 100644
--- a/src/mem/cache/tags/fa_lru.cc
+++ b/src/mem/cache/tags/fa_lru.cc
@@ -84,7 +84,7 @@
}
void
-FALRU::init(BaseCache* cache)
+FALRU::tagsInit(BaseCache* cache)
{
// Set parent cache
setCache(cache);
diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh
index 1504399..6ea4c8d 100644
--- a/src/mem/cache/tags/fa_lru.hh
+++ b/src/mem/cache/tags/fa_lru.hh
@@ -163,7 +163,7 @@
*
* @param _cache Pointer to parent cache.
*/
- void init(BaseCache *_cache) override;
+ void tagsInit(BaseCache *_cache) override;
/**
* Register the stats for this object.
diff --git a/src/mem/cache/tags/sector_tags.cc b/src/mem/cache/tags/sector_tags.cc
index 8c87074..24751c9 100644
--- a/src/mem/cache/tags/sector_tags.cc
+++ b/src/mem/cache/tags/sector_tags.cc
@@ -64,7 +64,7 @@
}
void
-SectorTags::init(BaseCache* cache)
+SectorTags::tagsInit(BaseCache* cache)
{
// Set parent cache
setCache(cache);
diff --git a/src/mem/cache/tags/sector_tags.hh b/src/mem/cache/tags/sector_tags.hh
index 40df782..1149ba1 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -105,7 +105,7 @@
*
* @param _cache Pointer to parent cache.
*/
- void init(BaseCache *_cache) override;
+ void tagsInit(BaseCache *_cache) override;
/**
* This function updates the tags when a block is invalidated but does
