Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45426 )
Change subject: arch,cpu: Rename DecodeCache namespace as decode_cache
......................................................................
arch,cpu: Rename DecodeCache namespace as decode_cache
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::DecodeCache became ::decode_cache.
Change-Id: Ia2b89b3fd802aae72a391786f7ea0a045de1fc2a
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45426
Tested-by: kokoro <[email protected]>
Reviewed-by: Hoa Nguyen <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/arch/generic/decode_cache.hh
M src/arch/riscv/decoder.hh
M src/arch/x86/decoder.hh
M src/cpu/decode_cache.hh
4 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/generic/decode_cache.hh
b/src/arch/generic/decode_cache.hh
index 84f90ca..b4caa72 100644
--- a/src/arch/generic/decode_cache.hh
+++ b/src/arch/generic/decode_cache.hh
@@ -40,13 +40,13 @@
class BasicDecodeCache
{
private:
- DecodeCache::InstMap<EMI> instMap;
+ decode_cache::InstMap<EMI> instMap;
struct AddrMapEntry
{
StaticInstPtr inst;
EMI machInst;
};
- DecodeCache::AddrMap<AddrMapEntry> decodePages;
+ decode_cache::AddrMap<AddrMapEntry> decodePages;
public:
/// Decode a machine instruction.
diff --git a/src/arch/riscv/decoder.hh b/src/arch/riscv/decoder.hh
index 9b3873d..932c4f2 100644
--- a/src/arch/riscv/decoder.hh
+++ b/src/arch/riscv/decoder.hh
@@ -45,7 +45,7 @@
class Decoder : public InstDecoder
{
private:
- DecodeCache::InstMap<ExtMachInst> instMap;
+ decode_cache::InstMap<ExtMachInst> instMap;
bool aligned;
bool mid;
bool more;
diff --git a/src/arch/x86/decoder.hh b/src/arch/x86/decoder.hh
index 5bea939..b43cf34 100644
--- a/src/arch/x86/decoder.hh
+++ b/src/arch/x86/decoder.hh
@@ -234,14 +234,14 @@
typedef RegVal CacheKey;
- typedef DecodeCache::AddrMap<Decoder::InstBytes> DecodePages;
+ typedef decode_cache::AddrMap<Decoder::InstBytes> DecodePages;
DecodePages *decodePages = nullptr;
typedef std::unordered_map<CacheKey, DecodePages *> AddrCacheMap;
AddrCacheMap addrCacheMap;
- DecodeCache::InstMap<ExtMachInst> *instMap = nullptr;
+ decode_cache::InstMap<ExtMachInst> *instMap = nullptr;
typedef std::unordered_map<
- CacheKey, DecodeCache::InstMap<ExtMachInst> *> InstCacheMap;
+ CacheKey, decode_cache::InstMap<ExtMachInst> *> InstCacheMap;
static InstCacheMap instCacheMap;
StaticInstPtr decodeInst(ExtMachInst mach_inst);
@@ -284,7 +284,7 @@
if (imIter != instCacheMap.end()) {
instMap = imIter->second;
} else {
- instMap = new DecodeCache::InstMap<ExtMachInst>;
+ instMap = new decode_cache::InstMap<ExtMachInst>;
instCacheMap[m5Reg] = instMap;
}
}
diff --git a/src/cpu/decode_cache.hh b/src/cpu/decode_cache.hh
index 20b6783..acaa8ca 100644
--- a/src/cpu/decode_cache.hh
+++ b/src/cpu/decode_cache.hh
@@ -32,9 +32,11 @@
#include <unordered_map>
#include "base/bitfield.hh"
+#include "base/compiler.hh"
#include "cpu/static_inst_fwd.hh"
-namespace DecodeCache
+GEM5_DEPRECATED_NAMESPACE(DecodeCache, decode_cache);
+namespace decode_cache
{
/// Hash for decoded instructions.
@@ -131,6 +133,6 @@
}
};
-} // namespace DecodeCache
+} // namespace decode_cache
#endif // __CPU_DECODE_CACHE_HH__
6 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45426
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ia2b89b3fd802aae72a391786f7ea0a045de1fc2a
Gerrit-Change-Number: 45426
Gerrit-PatchSet: 9
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
