From e044c59cc1ef0f199636b6ff0430fbf8c0422577 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 16 Aug 2018 06:57:25 -0400 Subject: [PATCH] target/arm: Initialize exc_secure correctly in do_v7m_exception_exit() In do_v7m_exception_exit(), we use the exc_secure variable to track whether the exception we're returning from is secure or non-secure. Unfortunately the statement initializing this was accidentally inside an "if (env->v7m.exception != ARMV7M_EXCP_NMI)" conditional, which meant that we were using the wrong value for NMI handlers. Move the initialization out to the right place. Backports commit b8109608bc6f3337298d44ac4369bf0bc8c3a1e4 from qemu --- qemu/target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 15289122..a161278f 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -6246,6 +6246,7 @@ static void do_v7m_exception_exit(ARMCPU *cpu) /* For all other purposes, treat ES as 0 (R_HXSR) */ excret &= ~R_V7M_EXCRET_ES_MASK; } + exc_secure = excret & R_V7M_EXCRET_ES_MASK; } if (env->v7m.exception != ARMV7M_EXCP_NMI) { @@ -6256,7 +6257,6 @@ static void do_v7m_exception_exit(ARMCPU *cpu) * which security state's faultmask to clear. (v8M ARM ARM R_KBNF.) */ if (arm_feature(env, ARM_FEATURE_M_SECURITY)) { - exc_secure = excret & R_V7M_EXCRET_ES_MASK; // Unicorn: commented out //if (armv7m_nvic_raw_execution_priority(env->nvic) >= 0) { // env->v7m.faultmask[es] = 0;