tcg/i386: Merge tcg_out_movcond{32,64}

Pass a rexw parameter instead of duplicating the functions.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-08-05 15:02:35 -07:00
parent 7ba99a1c76
commit 78ddf0dc75

View File

@ -1593,24 +1593,14 @@ static void tcg_out_cmov(TCGContext *s, TCGCond cond, int rexw,
} }
} }
static void tcg_out_movcond32(TCGContext *s, TCGCond cond, TCGReg dest, static void tcg_out_movcond(TCGContext *s, int rexw, TCGCond cond,
TCGReg c1, TCGArg c2, int const_c2, TCGReg dest, TCGReg c1, TCGArg c2, int const_c2,
TCGReg v1) TCGReg v1)
{ {
tcg_out_cmp(s, c1, c2, const_c2, 0); tcg_out_cmp(s, c1, c2, const_c2, rexw);
tcg_out_cmov(s, cond, 0, dest, v1); tcg_out_cmov(s, cond, rexw, dest, v1);
} }
#if TCG_TARGET_REG_BITS == 64
static void tcg_out_movcond64(TCGContext *s, TCGCond cond, TCGReg dest,
TCGReg c1, TCGArg c2, int const_c2,
TCGReg v1)
{
tcg_out_cmp(s, c1, c2, const_c2, P_REXW);
tcg_out_cmov(s, cond, P_REXW, dest, v1);
}
#endif
static void tcg_out_ctz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1, static void tcg_out_ctz(TCGContext *s, int rexw, TCGReg dest, TCGReg arg1,
TCGArg arg2, bool const_a2) TCGArg arg2, bool const_a2)
{ {
@ -2564,8 +2554,8 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
OP_32_64(setcond): OP_32_64(setcond):
tcg_out_setcond(s, rexw, args[3], a0, a1, a2, const_a2); tcg_out_setcond(s, rexw, args[3], a0, a1, a2, const_a2);
break; break;
case INDEX_op_movcond_i32: OP_32_64(movcond):
tcg_out_movcond32(s, args[5], a0, a1, a2, const_a2, args[3]); tcg_out_movcond(s, rexw, args[5], a0, a1, a2, const_a2, args[3]);
break; break;
OP_32_64(bswap16): OP_32_64(bswap16):
@ -2714,10 +2704,6 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc,
} }
break; break;
case INDEX_op_movcond_i64:
tcg_out_movcond64(s, args[5], a0, a1, a2, const_a2, args[3]);
break;
case INDEX_op_bswap64_i64: case INDEX_op_bswap64_i64:
tcg_out_bswap64(s, a0); tcg_out_bswap64(s, a0);
break; break;