diff options
Diffstat (limited to 'src/arch/x86')
| -rw-r--r-- | src/arch/x86/decoder.cc | 2 | ||||
| -rw-r--r-- | src/arch/x86/decoder.hh | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/arch/x86/decoder.cc b/src/arch/x86/decoder.cc index 835d5e25d..54701bb73 100644 --- a/src/arch/x86/decoder.cc +++ b/src/arch/x86/decoder.cc @@ -681,7 +681,7 @@ Decoder::InstCacheMap Decoder::instCacheMap; StaticInstPtr Decoder::decode(ExtMachInst mach_inst, Addr addr) { - DecodeCache::InstMap::iterator iter = instMap->find(mach_inst); + auto iter = instMap->find(mach_inst); if (iter != instMap->end()) return iter->second; diff --git a/src/arch/x86/decoder.hh b/src/arch/x86/decoder.hh index a60aa469a..3630ea8c8 100644 --- a/src/arch/x86/decoder.hh +++ b/src/arch/x86/decoder.hh @@ -229,8 +229,9 @@ class Decoder typedef std::unordered_map<CacheKey, DecodePages *> AddrCacheMap; AddrCacheMap addrCacheMap; - DecodeCache::InstMap *instMap; - typedef std::unordered_map<CacheKey, DecodeCache::InstMap *> InstCacheMap; + DecodeCache::InstMap<ExtMachInst> *instMap; + typedef std::unordered_map< + CacheKey, DecodeCache::InstMap<ExtMachInst> *> InstCacheMap; static InstCacheMap instCacheMap; public: @@ -277,7 +278,7 @@ class Decoder if (imIter != instCacheMap.end()) { instMap = imIter->second; } else { - instMap = new DecodeCache::InstMap; + instMap = new DecodeCache::InstMap<ExtMachInst>; instCacheMap[m5Reg] = instMap; } } |