From: Alex_Rozenman@mentor.com <Alex_Rozenman@mentor.com>
Date: Fri, 11 Jan 2013 15:21:22 +0000 (+0000)
Subject: target-arm: Fix SWI (SVC) instruction in M profile.
X-Git-Tag: v1.4.0-rc0~199^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=314e2296dc945e286b605563d7b6e6b269d29816;p=users%2Fdwmw2%2Fqemu.git

target-arm: Fix SWI (SVC) instruction in M profile.

When do_interrupt_v7m is called with EXCP_SWI, the PC already
points to the next instruction. Don't modify it here.

Signed-off-by: Alex Rozenman <Alex_Rozenman@mentor.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 0525aec87a..66ab78e3f1 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1736,7 +1736,7 @@ static void do_interrupt_v7m(CPUARMState *env)
         armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_USAGE);
         return;
     case EXCP_SWI:
-        env->regs[15] += 2;
+        /* The PC already points to the next instruction.  */
         armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_SVC);
         return;
     case EXCP_PREFETCH_ABORT: