yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-19 18:18:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

armv7m: Clear FAULTMASK on return from non-NMI exceptions

Browse Source 
FAULTMASK must be cleared on return from all
exceptions other than NMI.

Backports commit a20ee6005564590d33eabec11ed4dc7c432db36b from qemu
This commit is contained in:
Michael Davidsaver 2018-03-02 13:41:13 -05:00 committed by Lioncash
parent cc9458cf59
commit 7f044bf8cc
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qemu/target/arm/helper.c
View File

@ -5339,8 +5339,14 @@ static void do_v7m_exception_exit(CPUARMState *env)
uint32_t xpsr; uint32_t xpsr;
type = env->regs[15]; type = env->regs[15];
//if (env->v7m.exception != 0) if (env->v7m.exception != ARMV7M_EXCP_NMI) {
// armv7m_nvic_complete_irq(env->nvic, env->v7m.exception); /* Auto-clear FAULTMASK on return from other than NMI */
env->daif &= ~PSTATE_F;
}
/* Unicorn: commented out
if (env->v7m.exception != 0) {
armv7m_nvic_complete_irq(env->nvic, env->v7m.exception);
}*/
/* Switch to the target stack. */ /* Switch to the target stack. */
switch_v7m_sp(env, (type & 4) != 0); switch_v7m_sp(env, (type & 4) != 0);