From: Peter Maydell Date: Mon, 4 Sep 2017 14:21:51 +0000 (+0100) Subject: target/arm: Don't trap WFI/WFE for M profile X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0e2845689ebdb4ea7174f96f6797e2d8942bd114;p=qmiga%2Fqemu.git target/arm: Don't trap WFI/WFE for M profile M profile cores can never trap on WFI or WFE instructions. Check for M profile in check_wfx_trap() to ensure this. The existing code will do the right thing for v7M cores because the hcr_el2 and scr_el3 registers will be all-zeroes and so we won't attempt to trap, but when we start setting ARM_FEATURE_V8 for v8M cores the v8A handling of SCTLR.nTWE and .nTWI will not give the right results. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Richard Henderson Message-id: 1501692241-23310-3-git-send-email-peter.maydell@linaro.org --- diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 2a85666579..5a94a5f2ba 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -370,6 +370,11 @@ static inline int check_wfx_trap(CPUARMState *env, bool is_wfe) int cur_el = arm_current_el(env); uint64_t mask; + if (arm_feature(env, ARM_FEATURE_M)) { + /* M profile cores can never trap WFI/WFE. */ + return 0; + } + /* If we are currently in EL0 then we need to check if SCTLR is set up for * WFx instructions being trapped to EL1. These trap bits don't exist in v7. */