From: balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sun, 10 Jun 2007 13:53:18 +0000 (+0000)
Subject: Use the same offset for all STR and STM instructions that store r15, as specified... 
X-Git-Tag: xen-3.3.0-rc1~1389
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7a774c875b9995d9b40201f09a78efc73ad4c818;p=qemu-xen-4.0-testing.git

Use the same offset for all STR and STM instructions that store r15, as specified in ARM ARM (patch from Chris McNett).


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

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 364f4ead..246839d1 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -2837,8 +2837,8 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
                         } else {
                             /* store */
                             if (i == 15) {
-                                /* special case: r15 = PC + 12 */
-                                val = (long)s->pc + 8;
+                                /* special case: r15 = PC + 8 */
+                                val = (long)s->pc + 4;
                                 gen_op_movl_TN_im[0](val);
                             } else if (user) {
                                 gen_op_movl_T0_user(i);