gwj / at91sam9263 · Commits

Commit 7a774c875b9995d9b40201f09a78efc73ad4c818

Authored by balrog
1 parent c9bac22c

Use the same offset for all STR and STM instructions that store r15, as specifie… 

…d in ARM ARM (patch from Chris McNett).


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2970 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
target-arm/translate.c
  View file @7a774c8
@@ -2837,8 +2837,8 @@ static void disas_arm_insn(CPUState * env, DisasContext *s) @@ -2837,8 +2837,8 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)
2837 } else { 2837 } else {
2838 /* store */ 2838 /* store */
2839 if (i == 15) { 2839 if (i == 15) {
2840 - /* special case: r15 = PC + 12 */  
2841 - val = (long)s->pc + 8; 2840 + /* special case: r15 = PC + 8 */
  2841 + val = (long)s->pc + 4;
2842 gen_op_movl_TN_im[0](val); 2842 gen_op_movl_TN_im[0](val);
2843 } else if (user) { 2843 } else if (user) {
2844 gen_op_movl_T0_user(i); 2844 gen_op_movl_T0_user(i);