Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 --
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 27 +++++++++------------------
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index f5c9248fc93..e751e721a84 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -166,7 +166,6 @@ void tcg_gen_ext_i32(TCGv_i32 ret, TCGv_i32 val, MemOp opc);
void tcg_gen_bswap16_i32(TCGv_i32 ret, TCGv_i32 arg, int flags);
void tcg_gen_bswap32_i32(TCGv_i32 ret, TCGv_i32 arg);
void tcg_gen_hswap_i32(TCGv_i32 ret, TCGv_i32 arg);
-void tcg_gen_smax_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_umin_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_umax_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_ussub_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -209,7 +208,6 @@ void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg, int
flags);
void tcg_gen_bswap64_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_hswap_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_wswap_i64(TCGv_i64 ret, TCGv_i64 arg);
-void tcg_gen_smax_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_umin_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_umax_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_ussub_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2);
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index f616e27a228..6eb33424581 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -52,6 +52,7 @@ DEF_RRR(rotr)
DEF_RRR(sar)
DEF_RRR(shl)
DEF_RRR(shr)
+DEF_RRR(smax)
DEF_RRR(smin)
DEF_RRR(sub)
DEF_RRR(xor)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 34f1ee060ac..d72e64e709f 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -1073,6 +1073,15 @@ static void gen_shri(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
}
}
+static void gen_smax(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
+{
+ if (tcg_op_supported(INDEX_op_smax, type, 0)) {
+ gen_op_ttt(INDEX_op_smax, type, dst, src1, src2);
+ } else {
+ gen_movcond(type, TCG_COND_GT, dst, src1, src2, src1, src2);
+ }
+}
+
static void gen_smin(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
if (tcg_op_supported(INDEX_op_smin, type, 0)) {
@@ -1505,15 +1514,6 @@ void tcg_gen_umin_i32(TCGv_i32 ret, TCGv_i32 a, TCGv_i32
b)
}
}
-void tcg_gen_smax_i32(TCGv_i32 ret, TCGv_i32 a, TCGv_i32 b)
-{
- if (tcg_op_supported(INDEX_op_smax, TCG_TYPE_I32, 0)) {
- tcg_gen_op3_i32(INDEX_op_smax, ret, a, b);
- } else {
- tcg_gen_movcond_i32(TCG_COND_LT, ret, a, b, b, a);
- }
-}
-
void tcg_gen_umax_i32(TCGv_i32 ret, TCGv_i32 a, TCGv_i32 b)
{
if (tcg_op_supported(INDEX_op_umax, TCG_TYPE_I32, 0)) {
@@ -2036,15 +2036,6 @@ void tcg_gen_umin_i64(TCGv_i64 ret, TCGv_i64 a, TCGv_i64
b)
}
}
-void tcg_gen_smax_i64(TCGv_i64 ret, TCGv_i64 a, TCGv_i64 b)
-{
- if (tcg_op_supported(INDEX_op_smax, TCG_TYPE_I64, 0)) {
- tcg_gen_op3_i64(INDEX_op_smax, ret, a, b);
- } else {
- tcg_gen_movcond_i64(TCG_COND_LT, ret, a, b, b, a);
- }
-}
-
void tcg_gen_umax_i64(TCGv_i64 ret, TCGv_i64 a, TCGv_i64 b)
{
if (tcg_op_supported(INDEX_op_umax, TCG_TYPE_I64, 0)) {
--
2.53.0
