aboutsummaryrefslogtreecommitdiff
path: root/target-arm
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-11-03 22:25:25 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-11-03 22:25:25 +0000
commite748ba4f5352061474668a47341abe2a898e03ad (patch)
tree0d2711dbb3b579eb7d0d30254e986c7b6f535799 /target-arm
parentb8ed223bfe3b1af434adce07b2981ce8b5b9ecb4 (diff)
ARM half word load/store fix (Ulrich Hecht)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@438 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-arm')
-rw-r--r--target-arm/translate.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c
index bffeefa4fb..808fa2b34f 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -546,8 +546,7 @@ static void disas_arm_insn(DisasContext *s)
rn = (insn >> 16) & 0xf;
rd = (insn >> 12) & 0xf;
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)) {
/* load */
switch(sh) {
@@ -562,8 +561,10 @@ static void disas_arm_insn(DisasContext *s)
gen_op_ldsw_T0_T1();
break;
}
+ gen_movl_reg_T0(s, rd);
} else {
/* store */
+ gen_movl_T0_reg(s, rd);
gen_op_stw_T0_T1();
}
if (!(insn & (1 << 24))) {