From e3793fd8a9b7096a67a0f4260a36cd4dd5afe72f Mon Sep 17 00:00:00 2001 From: Hsuan Hsu Date: Fri, 3 Jul 2020 09:41:03 +0800 Subject: [PATCH] arch-arm: Remove m5ops_base declaration from ArmSystem This declaration should have been removed but was accidentally re-added. It keeps m5ops_base from being passed correctly from Python to C++ when using ARM ISA, and hence triggers gem5 crash when the guest tries to call m5ops. This change removes it again to fix the crash. JIRA: https://gem5.atlassian.net/browse/GEM5-658 Change-Id: I8df4ff19ecc0d64255f24dc991f71b065d2a894e Signed-off-by: Hsuan Hsu Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/30914 Reviewed-by: Gabe Black Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- src/arch/arm/ArmSystem.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py index 6555ea92e..c4cc51fbf 100644 --- a/src/arch/arm/ArmSystem.py +++ b/src/arch/arm/ArmSystem.py @@ -79,10 +79,6 @@ class ArmSystem(System): semihosting = Param.ArmSemihosting(NULL, "Enable support for the Arm semihosting by settings this parameter") - m5ops_base = Param.Addr(0, - "Base of the 64KiB PA range used for memory-mapped m5ops. Set to 0 " - "to disable.") - # Set to true if simulation provides a PSCI implementation # This flag will be checked when auto-generating # a PSCI node. A client (e.g Linux) would then be able to -- 2.30.2