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

target-arm: Remove uses of gen_{ld,st}* from iWMMXt code 

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Peter Maydell 2013-05-23 12:59:57 +01:00 committed by Blue Swirl
parent 8ed1237d64
commit 29531141a7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
target-arm/translate.c
View File

@ -1473,13 +1473,15 @@ static int disas_iwmmxt_insn(CPUARMState *env, DisasContext *s, uint32_t insn)
tcg_gen_qemu_ld64(cpu_M0, addr, IS_USER(s)); tcg_gen_qemu_ld64(cpu_M0, addr, IS_USER(s));
i = 0; i = 0;
} else { /* WLDRW wRd */ } else { /* WLDRW wRd */
tmp = gen_ld32(addr, IS_USER(s)); tmp = tcg_temp_new_i32();
tcg_gen_qemu_ld32u(tmp, addr, IS_USER(s));
} }
} else { } else {
tmp = tcg_temp_new_i32();
if (insn & (1 << 22)) { /* WLDRH */ if (insn & (1 << 22)) { /* WLDRH */
tmp = gen_ld16u(addr, IS_USER(s)); tcg_gen_qemu_ld16u(tmp, addr, IS_USER(s));
} else { /* WLDRB */ } else { /* WLDRB */
tmp = gen_ld8u(addr, IS_USER(s)); tcg_gen_qemu_ld8u(tmp, addr, IS_USER(s));
} }
} }
if (i) { if (i) {
@ -1491,28 +1493,28 @@ static int disas_iwmmxt_insn(CPUARMState *env, DisasContext *s, uint32_t insn)
} else { } else {
if ((insn >> 28) == 0xf) { /* WSTRW wCx */ if ((insn >> 28) == 0xf) { /* WSTRW wCx */
tmp = iwmmxt_load_creg(wrd); tmp = iwmmxt_load_creg(wrd);
gen_st32(tmp, addr, IS_USER(s)); tcg_gen_qemu_st32(tmp, addr, IS_USER(s));
} else { } else {
gen_op_iwmmxt_movq_M0_wRn(wrd); gen_op_iwmmxt_movq_M0_wRn(wrd);
tmp = tcg_temp_new_i32(); tmp = tcg_temp_new_i32();
if (insn & (1 << 8)) { if (insn & (1 << 8)) {
if (insn & (1 << 22)) { /* WSTRD */ if (insn & (1 << 22)) { /* WSTRD */
tcg_temp_free_i32(tmp);
tcg_gen_qemu_st64(cpu_M0, addr, IS_USER(s)); tcg_gen_qemu_st64(cpu_M0, addr, IS_USER(s));
} else { /* WSTRW wRd */ } else { /* WSTRW wRd */
tcg_gen_trunc_i64_i32(tmp, cpu_M0); tcg_gen_trunc_i64_i32(tmp, cpu_M0);
gen_st32(tmp, addr, IS_USER(s)); tcg_gen_qemu_st32(tmp, addr, IS_USER(s));
} }
} else { } else {
if (insn & (1 << 22)) { /* WSTRH */ if (insn & (1 << 22)) { /* WSTRH */
tcg_gen_trunc_i64_i32(tmp, cpu_M0); tcg_gen_trunc_i64_i32(tmp, cpu_M0);
gen_st16(tmp, addr, IS_USER(s)); tcg_gen_qemu_st16(tmp, addr, IS_USER(s));
} else { /* WSTRB */ } else { /* WSTRB */
tcg_gen_trunc_i64_i32(tmp, cpu_M0); tcg_gen_trunc_i64_i32(tmp, cpu_M0);
gen_st8(tmp, addr, IS_USER(s)); tcg_gen_qemu_st8(tmp, addr, IS_USER(s));
} }
} }
} }
tcg_temp_free_i32(tmp);
} }
tcg_temp_free_i32(addr); tcg_temp_free_i32(addr);
return 0; return 0;