From 52d06fd655d36ac4a8ae09934e091cf2bacf578f Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 15 Oct 2019 21:20:39 -0700 Subject: [PATCH] cpu: Turn the stage 2 ARM MMUs from params to children. These aren't referred to in the C++, so there's no reason for them to be parameters. By making them children, they can still be modified, replaced wholesale, or even replaced by an entirely different object to, for instance, mask them when they're not needed. Change-Id: Ic7f144a3cd3d1fca12fec220918aa72af885f61c Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21839 Reviewed-by: Jason Lowe-Power Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- src/cpu/BaseCPU.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/BaseCPU.py b/src/cpu/BaseCPU.py index 85e37776e..143ee9224 100644 --- a/src/cpu/BaseCPU.py +++ b/src/cpu/BaseCPU.py @@ -182,8 +182,8 @@ class BaseCPU(ClockedObject): dtb = Param.BaseTLB(ArchDTB(), "Data TLB") itb = Param.BaseTLB(ArchITB(), "Instruction TLB") if buildEnv['TARGET_ISA'] == 'arm': - istage2_mmu = Param.ArmStage2MMU(ArmStage2IMMU(), "Stage 2 trans") - dstage2_mmu = Param.ArmStage2MMU(ArmStage2DMMU(), "Stage 2 trans") + istage2_mmu = ArmStage2IMMU() + dstage2_mmu = ArmStage2DMMU() elif buildEnv['TARGET_ISA'] == 'power': UnifiedTLB = Param.Bool(True, "Is this a Unified TLB?") interrupts = ArchInterruptsParam([], "Interrupt Controller") -- 2.30.2