Commit e748ba4f authored by bellard's avatar bellard
Browse files

ARM half word load/store fix (Ulrich Hecht)


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@438 c046a42c-6fe2-441c-8c8c-71466251a162
parent b8ed223b
...@@ -546,7 +546,6 @@ static void disas_arm_insn(DisasContext *s) ...@@ -546,7 +546,6 @@ static void disas_arm_insn(DisasContext *s)
rn = (insn >> 16) & 0xf; rn = (insn >> 16) & 0xf;
rd = (insn >> 12) & 0xf; rd = (insn >> 12) & 0xf;
gen_movl_T1_reg(s, rn); gen_movl_T1_reg(s, rn);
if (insn & (1 << 25))
gen_add_datah_offset(s, insn); gen_add_datah_offset(s, insn);
if (insn & (1 << 20)) { if (insn & (1 << 20)) {
/* load */ /* load */
...@@ -562,8 +561,10 @@ static void disas_arm_insn(DisasContext *s) ...@@ -562,8 +561,10 @@ static void disas_arm_insn(DisasContext *s)
gen_op_ldsw_T0_T1(); gen_op_ldsw_T0_T1();
break; break;
} }
gen_movl_reg_T0(s, rd);
} else { } else {
/* store */ /* store */
gen_movl_T0_reg(s, rd);
gen_op_stw_T0_T1(); gen_op_stw_T0_T1();
} }
if (!(insn & (1 << 24))) { if (!(insn & (1 << 24))) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment