diff options
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/cache/SConscript | 2 | ||||
| -rw-r--r-- | src/mem/cache/base.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/cache.cc | 2 | ||||
| -rw-r--r-- | src/mem/cache/cache_blk.cc (renamed from src/mem/cache/blk.cc) | 2 | ||||
| -rw-r--r-- | src/mem/cache/cache_blk.hh (renamed from src/mem/cache/blk.hh) | 6 | ||||
| -rw-r--r-- | src/mem/cache/noncoherent_cache.cc | 2 | ||||
| -rw-r--r-- | src/mem/cache/sector_blk.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/tags/base.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/tags/base_set_assoc.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/tags/fa_lru.hh | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/src/mem/cache/SConscript b/src/mem/cache/SConscript index 24eea960e..8a4602b86 100644 --- a/src/mem/cache/SConscript +++ b/src/mem/cache/SConscript @@ -33,8 +33,8 @@ Import('*') SimObject('Cache.py') Source('base.cc') -Source('blk.cc') Source('cache.cc') +Source('cache_blk.cc') Source('mshr.cc') Source('mshr_queue.cc') Source('noncoherent_cache.cc') diff --git a/src/mem/cache/base.hh b/src/mem/cache/base.hh index 4ebc52493..92748a38b 100644 --- a/src/mem/cache/base.hh +++ b/src/mem/cache/base.hh @@ -63,7 +63,7 @@ #include "debug/Cache.hh" #include "debug/CachePort.hh" #include "enums/Clusivity.hh" -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "mem/cache/mshr_queue.hh" #include "mem/cache/tags/base.hh" #include "mem/cache/write_queue.hh" diff --git a/src/mem/cache/cache.cc b/src/mem/cache/cache.cc index 1b5316383..116b543cc 100644 --- a/src/mem/cache/cache.cc +++ b/src/mem/cache/cache.cc @@ -64,7 +64,7 @@ #include "debug/CacheTags.hh" #include "debug/CacheVerbose.hh" #include "enums/Clusivity.hh" -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "mem/cache/mshr.hh" #include "mem/cache/tags/base.hh" #include "mem/cache/write_queue_entry.hh" diff --git a/src/mem/cache/blk.cc b/src/mem/cache/cache_blk.cc index 45bd9bfd4..a77fc630a 100644 --- a/src/mem/cache/blk.cc +++ b/src/mem/cache/cache_blk.cc @@ -38,7 +38,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "base/cprintf.hh" diff --git a/src/mem/cache/blk.hh b/src/mem/cache/cache_blk.hh index 6d91e5584..80983a637 100644 --- a/src/mem/cache/blk.hh +++ b/src/mem/cache/cache_blk.hh @@ -45,8 +45,8 @@ * Definitions of a simple cache block class. */ -#ifndef __MEM_CACHE_BLK_HH__ -#define __MEM_CACHE_BLK_HH__ +#ifndef __MEM_CACHE_CACHE_BLK_HH__ +#define __MEM_CACHE_CACHE_BLK_HH__ #include <cassert> #include <cstdint> @@ -463,4 +463,4 @@ class CacheBlkPrintWrapper : public Printable const std::string &prefix = "") const; }; -#endif //__MEM_CACHE_BLK_HH__ +#endif //__MEM_CACHE_CACHE_BLK_HH__ diff --git a/src/mem/cache/noncoherent_cache.cc b/src/mem/cache/noncoherent_cache.cc index fb8193a99..b4ffed786 100644 --- a/src/mem/cache/noncoherent_cache.cc +++ b/src/mem/cache/noncoherent_cache.cc @@ -60,7 +60,7 @@ #include "base/trace.hh" #include "base/types.hh" #include "debug/Cache.hh" -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "mem/cache/mshr.hh" #include "params/NoncoherentCache.hh" diff --git a/src/mem/cache/sector_blk.hh b/src/mem/cache/sector_blk.hh index 66d83a230..3d09d2b49 100644 --- a/src/mem/cache/sector_blk.hh +++ b/src/mem/cache/sector_blk.hh @@ -38,7 +38,7 @@ #include <vector> -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "mem/cache/replacement_policies/base.hh" class SectorBlk; diff --git a/src/mem/cache/tags/base.hh b/src/mem/cache/tags/base.hh index 589de37c0..257b1bd29 100644 --- a/src/mem/cache/tags/base.hh +++ b/src/mem/cache/tags/base.hh @@ -57,7 +57,7 @@ #include "base/logging.hh" #include "base/statistics.hh" #include "base/types.hh" -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "params/BaseTags.hh" #include "sim/clocked_object.hh" diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh index 11c0c8d11..f73a5d92f 100644 --- a/src/mem/cache/tags/base_set_assoc.hh +++ b/src/mem/cache/tags/base_set_assoc.hh @@ -55,7 +55,7 @@ #include "base/logging.hh" #include "base/types.hh" #include "mem/cache/base.hh" -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "mem/cache/replacement_policies/base.hh" #include "mem/cache/tags/base.hh" #include "mem/cache/tags/indexing_policies/base.hh" diff --git a/src/mem/cache/tags/fa_lru.hh b/src/mem/cache/tags/fa_lru.hh index c2f983468..15043995f 100644 --- a/src/mem/cache/tags/fa_lru.hh +++ b/src/mem/cache/tags/fa_lru.hh @@ -60,7 +60,7 @@ #include "base/logging.hh" #include "base/statistics.hh" #include "base/types.hh" -#include "mem/cache/blk.hh" +#include "mem/cache/cache_blk.hh" #include "mem/cache/tags/base.hh" #include "params/FALRU.hh" |