[Qemu-devel] [4204] Fix the offset in Thumb bl instruction.

[Qemu-devel] [4204] Fix the offset in Thumb bl instruction.

[Andrzej Zaborowski]

Revision: 4204
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4204
Author:   balrog
Date:     2008-04-13 13:25:31 +0000 (Sun, 13 Apr 2008)

Log Message:
-----------
Fix the offset in Thumb bl instruction.

Modified Paths:
--------------
    trunk/target-arm/translate.c

Modified: trunk/target-arm/translate.c
===================================================================
--- trunk/target-arm/translate.c	2008-04-13 03:15:14 UTC (rev 4203)
+++ trunk/target-arm/translate.c	2008-04-13 13:25:31 UTC (rev 4204)
@@ -6912,7 +6912,7 @@
             /* Second half of bl.  */
             offset = ((insn & 0x7ff) << 1) | 1;
             tmp = load_reg(s, 14);
-            tcg_gen_addi_i32(tmp, tmp, 14);
+            tcg_gen_addi_i32(tmp, tmp, offset);
 
             tmp2 = new_tmp();
             tcg_gen_movi_i32(tmp2, s->pc | 1);
@@ -8308,7 +8308,7 @@
             tmp = load_reg(s, 13);
             val = (insn & 0x7f) * 4;
             if (insn & (1 << 7))
-              val = -(int32_t)val;
+                val = -(int32_t)val;
             tcg_gen_addi_i32(tmp, tmp, val);
             store_reg(s, 13, tmp);
             break;
@@ -8529,7 +8529,7 @@
 
     case 15:
         if (disas_thumb2_insn(env, s, insn))
-          goto undef32;
+            goto undef32;
         break;
     }
     return;