diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2011-10-16 05:06:38 -0700 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2011-10-16 05:06:38 -0700 |
| commit | b2af015b97e609f3e279e9fd050a8b90d4b93233 (patch) | |
| tree | 0c0403623b0d5ff960969b49caba61f7e00ebb79 /src/cpu/BaseCPU.py | |
| parent | dd8fed73872a7d4e6f78c3bba69842c7723b1560 (diff) | |
| download | gem5-b2af015b97e609f3e279e9fd050a8b90d4b93233.tar.xz | |
ARM: Turn on the page table walker on ARM in SE mode.
Diffstat (limited to 'src/cpu/BaseCPU.py')
| -rw-r--r-- | src/cpu/BaseCPU.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py index 430356004..277a2c8b4 100644 --- a/src/cpu/BaseCPU.py +++ b/src/cpu/BaseCPU.py @@ -140,8 +140,7 @@ class BaseCPU(MemObject): tracer = Param.InstTracer(default_tracer, "Instruction tracer") _cached_ports = [] - if buildEnv['TARGET_ISA'] == 'x86' or \ - (buildEnv['TARGET_ISA'] == 'arm' and buildEnv['FULL_SYSTEM']): + if buildEnv['TARGET_ISA'] in ['x86', 'arm']: _cached_ports = ["itb.walker.port", "dtb.walker.port"] _uncached_ports = [] @@ -169,16 +168,15 @@ class BaseCPU(MemObject): self.icache_port = ic.cpu_side self.dcache_port = dc.cpu_side self._cached_ports = ['icache.mem_side', 'dcache.mem_side'] - if buildEnv['FULL_SYSTEM']: - if buildEnv['TARGET_ISA'] == 'x86': - self.itb_walker_cache = iwc - self.dtb_walker_cache = dwc - self.itb.walker.port = iwc.cpu_side - self.dtb.walker.port = dwc.cpu_side - self._cached_ports += ["itb_walker_cache.mem_side", \ - "dtb_walker_cache.mem_side"] - elif buildEnv['TARGET_ISA'] == 'arm': - self._cached_ports += ["itb.walker.port", "dtb.walker.port"] + if buildEnv['TARGET_ISA'] == 'x86' and iwc and dwc: + self.itb_walker_cache = iwc + self.dtb_walker_cache = dwc + self.itb.walker.port = iwc.cpu_side + self.dtb.walker.port = dwc.cpu_side + self._cached_ports += ["itb_walker_cache.mem_side", \ + "dtb_walker_cache.mem_side"] + elif buildEnv['TARGET_ISA'] == 'arm': + self._cached_ports += ["itb.walker.port", "dtb.walker.port"] def addTwoLevelCacheHierarchy(self, ic, dc, l2c, iwc = None, dwc = None): self.addPrivateSplitL1Caches(ic, dc, iwc, dwc) |