If the address register overlaps one of the output registers simply issue the clobbering load last, rather than emitting an extra move of the address register.
Signed-off-by: Richard Henderson <r...@twiddle.net> --- tcg/i386/tcg-target.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tcg/i386/tcg-target.c b/tcg/i386/tcg-target.c index a10f6ca..489c2bf 100644 --- a/tcg/i386/tcg-target.c +++ b/tcg/i386/tcg-target.c @@ -785,22 +785,20 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, } break; case 3: - /* XXX: could be nicer */ - if (r0 == data_reg) { - r1 = TCG_REG_EDX; - if (r1 == data_reg) - r1 = TCG_REG_EAX; - tcg_out_mov(s, r1, r0); - r0 = r1; + if (bswap) { + int t = data_reg; + data_reg = data_reg2; + data_reg2 = t; } - if (!bswap) { + if (r0 != data_reg) { tcg_out_ld(s, TCG_TYPE_I32, data_reg, r0, GUEST_BASE); tcg_out_ld(s, TCG_TYPE_I32, data_reg2, r0, GUEST_BASE + 4); } else { - tcg_out_ld(s, TCG_TYPE_I32, data_reg, r0, GUEST_BASE + 4); + tcg_out_ld(s, TCG_TYPE_I32, data_reg2, r0, GUEST_BASE + 4); + tcg_out_ld(s, TCG_TYPE_I32, data_reg, r0, GUEST_BASE); + } + if (bswap) { tcg_out_bswap32(s, data_reg); - - tcg_out_ld(s, TCG_TYPE_I32, data_reg2, r0, GUEST_BASE); tcg_out_bswap32(s, data_reg2); } break; -- 1.6.6.1