summaryrefslogtreecommitdiff
path: root/src/mem/cache
diff options
context:
space:
mode:
authorDaniel R. Carvalho <odanrc@yahoo.com.br>2018-10-11 14:31:56 +0200
committerDaniel Carvalho <odanrc@yahoo.com.br>2018-10-11 13:24:53 +0000
commit7ed25a91c2ead4ada3554e52525aa72044f16237 (patch)
treeb83880cc1a626aec83a77b085429741766dcfc32 /src/mem/cache
parent3341bccfe2ebec50a6a13af3f6a0bf711655fee9 (diff)
downloadgem5-7ed25a91c2ead4ada3554e52525aa72044f16237.tar.xz
mem-cache: Move sector_blks to tags folder
Move sector_blks.hh and sector_blks.cc to the tags folder, as its usage scope is restricted to the tags, and caches should not be aware of them. Change-Id: Ia7a71f51ec251d827872daf108c87da543a0ba57 Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br> Reviewed-on: https://gem5-review.googlesource.com/c/13417 Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Maintainer: Nikos Nikoleris <nikos.nikoleris@arm.com>
Diffstat (limited to 'src/mem/cache')
-rw-r--r--src/mem/cache/SConscript1
-rw-r--r--src/mem/cache/tags/SConscript1
-rw-r--r--src/mem/cache/tags/sector_blk.cc (renamed from src/mem/cache/sector_blk.cc)2
-rw-r--r--src/mem/cache/tags/sector_blk.hh (renamed from src/mem/cache/sector_blk.hh)6
-rw-r--r--src/mem/cache/tags/sector_tags.hh2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/cache/SConscript b/src/mem/cache/SConscript
index 8a4602b86..1b2638e83 100644
--- a/src/mem/cache/SConscript
+++ b/src/mem/cache/SConscript
@@ -38,7 +38,6 @@ Source('cache_blk.cc')
Source('mshr.cc')
Source('mshr_queue.cc')
Source('noncoherent_cache.cc')
-Source('sector_blk.cc')
Source('write_queue.cc')
Source('write_queue_entry.cc')
diff --git a/src/mem/cache/tags/SConscript b/src/mem/cache/tags/SConscript
index 136abac2c..c654bf2eb 100644
--- a/src/mem/cache/tags/SConscript
+++ b/src/mem/cache/tags/SConscript
@@ -35,4 +35,5 @@ SimObject('Tags.py')
Source('base.cc')
Source('base_set_assoc.cc')
Source('fa_lru.cc')
+Source('sector_blk.cc')
Source('sector_tags.cc')
diff --git a/src/mem/cache/sector_blk.cc b/src/mem/cache/tags/sector_blk.cc
index 5607f4ccc..de9153639 100644
--- a/src/mem/cache/sector_blk.cc
+++ b/src/mem/cache/tags/sector_blk.cc
@@ -33,7 +33,7 @@
* sequence of cache blocks that may or may not be present in the cache.
*/
-#include "mem/cache/sector_blk.hh"
+#include "mem/cache/tags/sector_blk.hh"
#include <cassert>
diff --git a/src/mem/cache/sector_blk.hh b/src/mem/cache/tags/sector_blk.hh
index 3d09d2b49..d252a610f 100644
--- a/src/mem/cache/sector_blk.hh
+++ b/src/mem/cache/tags/sector_blk.hh
@@ -33,8 +33,8 @@
* sequence of cache blocks that may or may not be present in the cache.
*/
-#ifndef __MEM_CACHE_SECTOR_BLK_HH__
-#define __MEM_CACHE_SECTOR_BLK_HH__
+#ifndef __MEM_CACHE_TAGS_SECTOR_BLK_HH__
+#define __MEM_CACHE_TAGS_SECTOR_BLK_HH__
#include <vector>
@@ -175,4 +175,4 @@ class SectorBlk : public ReplaceableEntry
Addr getTag() const;
};
-#endif //__MEM_CACHE_SECTOR_BLK_HH__
+#endif //__MEM_CACHE_TAGS_SECTOR_BLK_HH__
diff --git a/src/mem/cache/tags/sector_tags.hh b/src/mem/cache/tags/sector_tags.hh
index 518ab28a9..40df7829d 100644
--- a/src/mem/cache/tags/sector_tags.hh
+++ b/src/mem/cache/tags/sector_tags.hh
@@ -39,8 +39,8 @@
#include <string>
#include <vector>
-#include "mem/cache/sector_blk.hh"
#include "mem/cache/tags/base.hh"
+#include "mem/cache/tags/sector_blk.hh"
#include "params/SectorTags.hh"
class BaseCache;