mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-03-23 06:25:12 +00:00
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
This commit is contained in:
parent
c79ebe4965
commit
e044c59cc1
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue