diff options
| author | Gabe Black <gabeblack@google.com> | 2018-03-27 01:20:05 -0700 |
|---|---|---|
| committer | Gabe Black <gabeblack@google.com> | 2018-03-27 10:57:54 +0000 |
| commit | 563e19d1fd151fe222af2455536d8239f5c6d3dc (patch) | |
| tree | 91a22d01bd431df0acaeb305c9bc91307ae65fd1 /src/arch/x86/decoder.hh | |
| parent | 4384493da74547e3af0537034fe2644688c388fe (diff) | |
| download | gem5-563e19d1fd151fe222af2455536d8239f5c6d3dc.tar.xz | |
arch: cpu: Make the ExtMachInst type a template argument in InstMap.
This doesn't completely hide the ISA specific ExtMachInst type inside
the ISAs since it still gets applied in arch/generic, but it at least
pulls it into the arch directory.
Change-Id: Ic2188d59696530d7ecafdff0785d71867182701d
Reviewed-on: https://gem5-review.googlesource.com/9403
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Diffstat (limited to 'src/arch/x86/decoder.hh')
| -rw-r--r-- | src/arch/x86/decoder.hh | 7 |
1 files changed, 4 insertions, 3 deletions
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; } } |