ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
pbrook 2008-09-22 00:52:42 +00:00
parent e4b3861d15
commit 3018f2598c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-arm/op_helper.c
View File

@ -56,7 +56,7 @@ uint32_t HELPER(neon_tbl)(uint32_t ireg, uint32_t def,
for (shift = 0; shift < 32; shift += 8) { for (shift = 0; shift < 32; shift += 8) {
index = (ireg >> shift) & 0xff; index = (ireg >> shift) & 0xff;
if (index < maxindex) { if (index < maxindex) {
tmp = (table[index >> 3] >> (index & 7)) & 0xff; tmp = (table[index >> 3] >> ((index & 7) << 3)) & 0xff;
val |= tmp << shift; val |= tmp << shift;
} else { } else {
val |= def & (0xff << shift); val |= def & (0xff << shift);

10
target-arm/translate.c
View File

@ -2807,7 +2807,7 @@ static int disas_vfp_insn(CPUState * env, DisasContext *s, uint32_t insn)
tmp2 = new_tmp(); tmp2 = new_tmp();
tcg_gen_mov_i32(tmp2, tmp); tcg_gen_mov_i32(tmp2, tmp);
neon_store_reg(rn, 0, tmp2); neon_store_reg(rn, 0, tmp2);
neon_store_reg(rn, 0, tmp); neon_store_reg(rn, 1, tmp);
} else { } else {
/* VMOV */ /* VMOV */
switch (size) { switch (size) {
@ -3814,7 +3814,7 @@ static int disas_neon_ls_insn(CPUState * env, DisasContext *s, uint32_t insn)
tmp2 = new_tmp(); tmp2 = new_tmp();
tcg_gen_mov_i32(tmp2, tmp); tcg_gen_mov_i32(tmp2, tmp);
neon_store_reg(rd, 0, tmp2); neon_store_reg(rd, 0, tmp2);
neon_store_reg(rd, 0, tmp); neon_store_reg(rd, 1, tmp);
rd += stride; rd += stride;
} }
stride = (1 << size) * nregs; 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) { } else if ((insn & (1 << 10)) == 0) {
/* VTBL, VTBX. */ /* VTBL, VTBX. */
n = (insn >> 5) & 0x18; n = ((insn >> 5) & 0x18) + 8;
if (insn & (1 << 6)) { if (insn & (1 << 6)) {
tmp = neon_load_reg(rd, 0); tmp = neon_load_reg(rd, 0);
} else { } else {
@ -5508,6 +5508,7 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn)
tmp2 = neon_load_reg(rm, 0); tmp2 = neon_load_reg(rm, 0);
gen_helper_neon_tbl(tmp2, tmp2, tmp, tcg_const_i32(rn), gen_helper_neon_tbl(tmp2, tmp2, tmp, tcg_const_i32(rn),
tcg_const_i32(n)); tcg_const_i32(n));
dead_tmp(tmp);
if (insn & (1 << 6)) { if (insn & (1 << 6)) {
tmp = neon_load_reg(rd, 1); tmp = neon_load_reg(rd, 1);
} else { } 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), gen_helper_neon_tbl(tmp3, tmp3, tmp, tcg_const_i32(rn),
tcg_const_i32(n)); tcg_const_i32(n));
neon_store_reg(rd, 0, tmp2); 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) { } else if ((insn & 0x380) == 0) {
/* VDUP */ /* VDUP */
if (insn & (1 << 19)) { if (insn & (1 << 19)) {