diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-05-23 12:59:57 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-05-26 10:05:18 +0000 |
| commit | 29531141a7658cfb9f6e5f72a685c3859a5fff8b (patch) | |
| tree | 52ff794f8565ff2d94e3de1cd100b2f4001deabb | |
| parent | 8ed1237d6401e0bd9461417b58b07e545bbc4b7e (diff) | |
| download | focaccia-qemu-29531141a7658cfb9f6e5f72a685c3859a5fff8b.tar.gz focaccia-qemu-29531141a7658cfb9f6e5f72a685c3859a5fff8b.zip | |
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>
| -rw-r--r-- | target-arm/translate.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c index 8e4652736e..7ce9a1c080 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -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)); i = 0; } 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 { + tmp = tcg_temp_new_i32(); if (insn & (1 << 22)) { /* WLDRH */ - tmp = gen_ld16u(addr, IS_USER(s)); + tcg_gen_qemu_ld16u(tmp, addr, IS_USER(s)); } else { /* WLDRB */ - tmp = gen_ld8u(addr, IS_USER(s)); + tcg_gen_qemu_ld8u(tmp, addr, IS_USER(s)); } } if (i) { @@ -1491,28 +1493,28 @@ static int disas_iwmmxt_insn(CPUARMState *env, DisasContext *s, uint32_t insn) } else { if ((insn >> 28) == 0xf) { /* WSTRW wCx */ tmp = iwmmxt_load_creg(wrd); - gen_st32(tmp, addr, IS_USER(s)); + tcg_gen_qemu_st32(tmp, addr, IS_USER(s)); } else { gen_op_iwmmxt_movq_M0_wRn(wrd); tmp = tcg_temp_new_i32(); if (insn & (1 << 8)) { if (insn & (1 << 22)) { /* WSTRD */ - tcg_temp_free_i32(tmp); tcg_gen_qemu_st64(cpu_M0, addr, IS_USER(s)); } else { /* WSTRW wRd */ 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 { if (insn & (1 << 22)) { /* WSTRH */ 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 */ 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); return 0; |