diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-22 00:52:42 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-09-22 00:52:42 +0000 |
| commit | 3018f2598c047e13b4479a47f55bfa7618e17381 (patch) | |
| tree | 48b9b4b2b5468a8889ede519f32358772643be88 | |
| parent | e4b3861d15d43d2c8d834a1a3826676d97b82abf (diff) | |
| download | qemu-3018f2598c047e13b4479a47f55bfa7618e17381.zip | |
Fix ARM NEON vdup and vtbl bugs.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5286 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | target-arm/op_helper.c | 2 | ||||
| -rw-r--r-- | target-arm/translate.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/target-arm/op_helper.c b/target-arm/op_helper.c index 2d7be9c04f..9a384ebe1d 100644 --- a/target-arm/op_helper.c +++ b/target-arm/op_helper.c @@ -56,7 +56,7 @@ uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def, for (shift = 0; shift < 32; shift += 8) { index = (ireg >> shift) & 0xff; if (index < maxindex) { - tmp = (table[index >> 3] >> (index & 7)) & 0xff; + tmp = (table[index >> 3] >> ((index & 7) << 3)) & 0xff; val |= tmp << shift; } else { val |= def & (0xff << shift); diff --git a/target-arm/translate.c b/target-arm/translate.c index 883333dcf4..593d61e547 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -2807,7 +2807,7 @@ static int disas_vfp_insn(CPUState * env, DisasContext *s, uint32_t insn) tmp2 = new_tmp(); tcg_gen_mov_i32(tmp2, tmp); neon_store_reg(rn, 0, tmp2); - neon_store_reg(rn, 0, tmp); + neon_store_reg(rn, 1, tmp); } else { /* VMOV */ switch (size) { @@ -3814,7 +3814,7 @@ static int disas_neon_ls_insn(CPUState * env, DisasContext *s, uint32_t insn) tmp2 = new_tmp(); tcg_gen_mov_i32(tmp2, tmp); neon_store_reg(rd, 0, tmp2); - neon_store_reg(rd, 0, tmp); + neon_store_reg(rd, 1, tmp); rd += stride; } stride = (1 << size) * nregs; @@ -5498,7 +5498,7 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) } } else if ((insn & (1 << 10)) == 0) { /* VTBL, VTBX. */ - n = (insn >> 5) & 0x18; + n = ((insn >> 5) & 0x18) + 8; if (insn & (1 << 6)) { tmp = neon_load_reg(rd, 0); } else { @@ -5508,6 +5508,7 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) tmp2 = neon_load_reg(rm, 0); gen_helper_neon_tbl(tmp2, tmp2, tmp, tcg_const_i32(rn), tcg_const_i32(n)); + dead_tmp(tmp); if (insn & (1 << 6)) { tmp = neon_load_reg(rd, 1); } else { @@ -5518,7 +5519,8 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) gen_helper_neon_tbl(tmp3, tmp3, tmp, tcg_const_i32(rn), tcg_const_i32(n)); neon_store_reg(rd, 0, tmp2); - neon_store_reg(rd, 1, tmp2); + neon_store_reg(rd, 1, tmp3); + dead_tmp(tmp); } else if ((insn & 0x380) == 0) { /* VDUP */ if (insn & (1 << 19)) { |