Fix the offset in Thumb bl instruction.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4204 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2008-04-13 13:25:31 +00:00
parent 2637a3beb9
commit 6a0d8a1d23

View File

@ -6912,7 +6912,7 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1)
/* Second half of bl. */ /* Second half of bl. */
offset = ((insn & 0x7ff) << 1) | 1; offset = ((insn & 0x7ff) << 1) | 1;
tmp = load_reg(s, 14); tmp = load_reg(s, 14);
tcg_gen_addi_i32(tmp, tmp, 14); tcg_gen_addi_i32(tmp, tmp, offset);
tmp2 = new_tmp(); tmp2 = new_tmp();
tcg_gen_movi_i32(tmp2, s->pc | 1); tcg_gen_movi_i32(tmp2, s->pc | 1);
@ -8308,7 +8308,7 @@ static void disas_thumb_insn(CPUState *env, DisasContext *s)
tmp = load_reg(s, 13); tmp = load_reg(s, 13);
val = (insn & 0x7f) * 4; val = (insn & 0x7f) * 4;
if (insn & (1 << 7)) if (insn & (1 << 7))
val = -(int32_t)val; val = -(int32_t)val;
tcg_gen_addi_i32(tmp, tmp, val); tcg_gen_addi_i32(tmp, tmp, val);
store_reg(s, 13, tmp); store_reg(s, 13, tmp);
break; break;
@ -8529,7 +8529,7 @@ static void disas_thumb_insn(CPUState *env, DisasContext *s)
case 15: case 15:
if (disas_thumb2_insn(env, s, insn)) if (disas_thumb2_insn(env, s, insn))
goto undef32; goto undef32;
break; break;
} }
return; return;