From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Wed, 16 Apr 2008 23:17:02 +0000 (+0000)
Subject: Save the exact SWI return address in Thumb mode.
X-Git-Tag: xen-3.3.0-rc1~194^2^2~235
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=422ebf6979001c2874151509260c73c2bcede5da;p=qemu-xen-4.1-testing.git

Save the exact SWI return address in Thumb mode.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4217 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 467858660..5751e2f4e 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -8492,7 +8492,7 @@ static void disas_thumb_insn(CPUState *env, DisasContext *s)
         if (cond == 0xf) {
             /* swi */
             gen_set_condexec(s);
-            gen_set_pc_im(s->pc | 1);
+            gen_set_pc_im(s->pc);
             s->is_jmp = DISAS_SWI;
             break;
         }