From 718b53dc441abb80a8ba40d2ae22b40fd1c83427 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Tue, 28 Nov 2017 16:00:02 +0000 Subject: [PATCH] arch-arm: Correct SecureMonitorTrap vals for aarch32 This patch replaces the dummy values which were defined for the SecureMonitorTrap thus enabling its usage in aarch32 mode. 1) It changes the vector table offset from 0x14 to 0x4 in compliance with the armv8 documentation. 2) When trapping in monitor mode for aarch32, the mon_lr is updated with the pc + a non zero offset (+4/2 depending on the current instruction set: +4 for A32, +2 for T32). Change-Id: I01e1e52bf5ecd405e7472e31e01cf9a599153b08 Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/8041 Maintainer: Andreas Sandberg --- src/arch/arm/faults.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc index e3488f428..0f54906ac 100644 --- a/src/arch/arm/faults.cc +++ b/src/arch/arm/faults.cc @@ -237,6 +237,10 @@ template<> ArmFault::FaultVals ArmFaultVals::vals = { "Hypervisor Trap", 0x014, 0x000, 0x200, 0x400, 0x600, MODE_HYP, 0, 0, 0, 0, false, false, false, EC_UNKNOWN, FaultStat() }; +template<> ArmFault::FaultVals ArmFaultVals::vals = { + "Secure Monitor Trap", 0x004, 0x000, 0x200, 0x400, 0x600, MODE_MON, + 4, 2, 0, 0, false, false, false, EC_UNKNOWN, FaultStat() +}; template<> ArmFault::FaultVals ArmFaultVals::vals = { "IRQ", 0x018, 0x080, 0x280, 0x480, 0x680, MODE_IRQ, 4, 4, 0, 0, false, true, false, EC_UNKNOWN, FaultStat() @@ -258,11 +262,6 @@ template<> ArmFault::FaultVals ArmFaultVals::vals = { "Supervisor Trap", 0x014, 0x000, 0x200, 0x400, 0x600, MODE_SVC, 0, 0, 0, 0, false, false, false, EC_UNKNOWN, FaultStat() }; -template<> ArmFault::FaultVals ArmFaultVals::vals = { - // Some dummy values (SecureMonitorTrap is AArch64-only) - "Secure Monitor Trap", 0x014, 0x000, 0x200, 0x400, 0x600, MODE_MON, - 0, 0, 0, 0, false, false, false, EC_UNKNOWN, FaultStat() -}; template<> ArmFault::FaultVals ArmFaultVals::vals = { // Some dummy values (PCAlignmentFault is AArch64-only) "PC Alignment Fault", 0x000, 0x000, 0x200, 0x400, 0x600, MODE_SVC, -- 2.30.2