Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 --
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 35 +++++++++++++++--------------------
3 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 79a3e82c98f..b64b54fcdee 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -147,7 +147,6 @@ 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_ussub_i32(TCGv_i32, TCGv_i32 arg1, TCGv_i32 arg2);
-void tcg_gen_abs_i32(TCGv_i32, TCGv_i32);
void tcg_gen_revbit8_i32(TCGv_i32 ret, TCGv_i32 arg);
void tcg_gen_revbit32_i32(TCGv_i32 ret, TCGv_i32 arg);
@@ -186,7 +185,6 @@ 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_ussub_i64(TCGv_i64, TCGv_i64 arg1, TCGv_i64 arg2);
-void tcg_gen_abs_i64(TCGv_i64, TCGv_i64);
void tcg_gen_revbit8_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_revbit32_i64(TCGv_i64 ret, TCGv_i64 arg, int flags);
void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg);
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 1405dff32aa..69df7967c76 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: MIT */
+DEF2(abs, TCGV, TCGV)
DEF3(add, TCGV, TCGV, TCGV)
DEF3(addi, TCGV, TCGV, TINT)
DEF3(and, TCGV, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 5ed6cfd8f89..afd764ef16d 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -415,6 +415,21 @@ static void gen_extu_i32_i64(TCGTemp *dst, TCGTemp *src);
* are of the proper type.
*/
+static void gen_abs(TCGType type, TCGTemp *dst, TCGTemp *src)
+{
+ g_autoptr(TCGTemp) tmp = tcg_temp_new_ebb(type);
+
+ if (tcg_op_supported(INDEX_op_smax, type, 0)) {
+ gen_neg(type, tmp, src);
+ gen_smax(type, dst, tmp, src);
+ } else {
+ int width = tcg_type_size(type) * 8;
+ gen_sari(type, tmp, src, width - 1);
+ gen_xor(type, dst, src, tmp);
+ gen_sub(type, dst, dst, tmp);
+ }
+}
+
static void gen_add(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_add, type, dst, src1, src2);
@@ -1480,16 +1495,6 @@ void tcg_gen_ussub_i32(TCGv_i32 ret, TCGv_i32 a,
TCGv_i32 b)
tcg_temp_free_i32(t);
}
-void tcg_gen_abs_i32(TCGv_i32 ret, TCGv_i32 a)
-{
- TCGv_i32 t = tcg_temp_ebb_new_i32();
-
- tcg_gen_sari_i32(t, a, 31);
- tcg_gen_xor_i32(ret, a, t);
- tcg_gen_sub_i32(ret, ret, t);
- tcg_temp_free_i32(t);
-}
-
void tcg_gen_ld8u_i32(TCGv_i32 ret, TCGv_ptr arg2, tcg_target_long offset)
{
tcg_gen_ldst_op_i32(INDEX_op_ld8u, ret, arg2, offset);
@@ -1984,16 +1989,6 @@ void tcg_gen_ussub_i64(TCGv_i64 ret, TCGv_i64 a,
TCGv_i64 b)
tcg_temp_free_i64(t);
}
-void tcg_gen_abs_i64(TCGv_i64 ret, TCGv_i64 a)
-{
- TCGv_i64 t = tcg_temp_ebb_new_i64();
-
- tcg_gen_sari_i64(t, a, 63);
- tcg_gen_xor_i64(ret, a, t);
- tcg_gen_sub_i64(ret, ret, t);
- tcg_temp_free_i64(t);
-}
-
/* Size changing operations. */
void tcg_gen_extrl_i64_i32(TCGv_i32 ret, TCGv_i64 arg)
--
2.53.0
