diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:07:59 -0400 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2015-10-12 04:07:59 -0400 |
| commit | 22c04190c607b9360d9a23548f8a54e83cf0e74a (patch) | |
| tree | 576135962e3c9c725157b461c8009b05933bba2b /src/arch/x86/decoder.hh | |
| parent | 735c4a87665119a33443cf8d191d329c66191c6e (diff) | |
| download | gem5-22c04190c607b9360d9a23548f8a54e83cf0e74a.tar.xz | |
misc: Remove redundant compiler-specific defines
This patch moves away from using M5_ATTR_OVERRIDE and the m5::hashmap
(and similar) abstractions, as these are no longer needed with gcc 4.7
and clang 3.1 as minimum compiler versions.
Diffstat (limited to 'src/arch/x86/decoder.hh')
| -rw-r--r-- | src/arch/x86/decoder.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/x86/decoder.hh b/src/arch/x86/decoder.hh index d42751d21..2e5e83764 100644 --- a/src/arch/x86/decoder.hh +++ b/src/arch/x86/decoder.hh @@ -32,6 +32,7 @@ #define __ARCH_X86_DECODER_HH__ #include <cassert> +#include <unordered_map> #include <vector> #include "arch/x86/regs/misc.hh" @@ -223,11 +224,11 @@ class Decoder typedef DecodeCache::AddrMap<Decoder::InstBytes> DecodePages; DecodePages *decodePages; - typedef m5::hash_map<CacheKey, DecodePages *> AddrCacheMap; + typedef std::unordered_map<CacheKey, DecodePages *> AddrCacheMap; AddrCacheMap addrCacheMap; DecodeCache::InstMap *instMap; - typedef m5::hash_map<CacheKey, DecodeCache::InstMap *> InstCacheMap; + typedef std::unordered_map<CacheKey, DecodeCache::InstMap *> InstCacheMap; static InstCacheMap instCacheMap; public: |