commit 314e2296dc945e286b605563d7b6e6b269d29816
author Alex_Rozenman@mentor.com <Alex_Rozenman@mentor.com> Fri Jan 11 15:21:22 2013 +0000
committer Peter Maydell <peter.maydell@linaro.org> Fri Jan 11 15:21:22 2013 +0000
tree 04b83865b48e069e6aa1fd60c21c37362d8f4ea4
parent 918fd0839eeafc83bd4984364321a947d29041fe

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>

target-arm/helper.c

diff --git a/target-arm/helper.c b/target-arm/helper.c
index 0525aec..66ab78e 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1736,7 +1736,7 @@
         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: