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/generic | |
| 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/generic')
| -rw-r--r-- | src/arch/generic/decode_cache.cc | 2 | ||||
| -rw-r--r-- | src/arch/generic/decode_cache.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/generic/decode_cache.cc b/src/arch/generic/decode_cache.cc index 782dfca43..0f7a9d991 100644 --- a/src/arch/generic/decode_cache.cc +++ b/src/arch/generic/decode_cache.cc @@ -46,7 +46,7 @@ BasicDecodeCache::decode(TheISA::Decoder *decoder, if (si && (si->machInst == mach_inst)) return si; - DecodeCache::InstMap::iterator iter = instMap.find(mach_inst); + auto iter = instMap.find(mach_inst); if (iter != instMap.end()) { si = iter->second; return si; diff --git a/src/arch/generic/decode_cache.hh b/src/arch/generic/decode_cache.hh index c6bce7226..ebfaa0645 100644 --- a/src/arch/generic/decode_cache.hh +++ b/src/arch/generic/decode_cache.hh @@ -47,7 +47,7 @@ namespace GenericISA class BasicDecodeCache { private: - DecodeCache::InstMap instMap; + DecodeCache::InstMap<TheISA::ExtMachInst> instMap; DecodeCache::AddrMap<StaticInstPtr> decodePages; public: |