From 7a774c875b9995d9b40201f09a78efc73ad4c818 Mon Sep 17 00:00:00 2001 From: balrog Date: Sun, 10 Jun 2007 13:53:18 +0000 Subject: [PATCH] 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 --- target-arm/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 364f4eadba..246839d1f3 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); -- 2.30.2