From b2caa738f080469658ba2ce7919460c28dc364a2 Mon Sep 17 00:00:00 2001
From: Paul Huerkamp <35733278+PAException@users.noreply.github.com>
Date: Wed, 9 Sep 2026 11:06:13 +0200
Subject: [PATCH] [#995]: fix Cortex-M exception return unable to restore
 exception number properly

---
 arch/arm/helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/helper.c b/arch/arm/helper.c
index a30d38425..7bba8e25f 100644
--- a/arch/arm/helper.c
+++ b/arch/arm/helper.c
@@ -1445,7 +1445,7 @@ void do_v7m_secure_return(CPUState *env)
     partialRETPSR = v7m_pop(env);
     env->v7m.control[M_REG_COMMON] |=
         deposit32(env->v7m.control[M_REG_COMMON], ARM_CONTROL_SFPA, 1, partialRETPSR & RETPSR_SFPA ? 1 : 0);
-    env->v7m.exception = partialRETPSR & ~RETPSR_SFPA;
+    env->v7m.exception = partialRETPSR & 0x1ff;
 
     env->event_register = 1;