Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 4 ----
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 36 ++++++++++++-----------------------
3 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 02272bc7e20..59f0f9ee0de 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -157,8 +157,6 @@ void tcg_gen_sextract_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al, TCGv_i32 ah,
unsigned int ofs);
-void tcg_gen_negsetcond_i32(TCGCond cond, TCGv_i32 ret,
- TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_negsetcondi_i32(TCGCond cond, TCGv_i32 ret,
TCGv_i32 arg1, int32_t arg2);
void tcg_gen_movcond_i32(TCGCond cond, TCGv_i32 ret, TCGv_i32 c1,
@@ -224,8 +222,6 @@ void tcg_gen_sextract_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, TCGv_i64 ah,
unsigned int ofs);
-void tcg_gen_negsetcond_i64(TCGCond cond, TCGv_i64 ret,
- TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_negsetcondi_i64(TCGCond cond, TCGv_i64 ret,
TCGv_i64 arg1, int64_t arg2);
void tcg_gen_movcond_i64(TCGCond cond, TCGv_i64 ret, TCGv_i64 c1,
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 030c59bcd47..5343b99f622 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -3,6 +3,7 @@
DEF_CRIL(brcondi)
DEF_CRRI(setcondi)
DEF_CRRL(brcond)
+DEF_CRRR(negsetcond)
DEF_CRRR(setcond)
DEF_R(discard)
DEF_RI(movi)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 1b4cb935bb9..a04a55c186a 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -538,6 +538,18 @@ static void gen_neg(TCGType type, TCGTemp *dst, TCGTemp
*src)
gen_op_tt(INDEX_op_neg, type, dst, src);
}
+static void gen_negsetcond(TCGType type, TCGCond cond, TCGTemp *dst,
+ TCGTemp *src1, TCGTemp *src2)
+{
+ if (cond == TCG_COND_ALWAYS) {
+ gen_movi(type, dst, -1);
+ } else if (cond == TCG_COND_NEVER) {
+ gen_movi(type, dst, 0);
+ } else {
+ gen_op_ttti(INDEX_op_negsetcond, type, dst, src1, src2, cond);
+ }
+}
+
static void gen_not(TCGType type, TCGTemp *dst, TCGTemp *src)
{
if (tcg_op_supported(INDEX_op_not, type, 0)) {
@@ -790,18 +802,6 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_negsetcond_i32(TCGCond cond, TCGv_i32 ret,
- TCGv_i32 arg1, TCGv_i32 arg2)
-{
- if (cond == TCG_COND_ALWAYS) {
- tcg_gen_movi_i32(ret, -1);
- } else if (cond == TCG_COND_NEVER) {
- tcg_gen_movi_i32(ret, 0);
- } else {
- tcg_gen_op4i_i32(INDEX_op_negsetcond, ret, arg1, arg2, cond);
- }
-}
-
void tcg_gen_negsetcondi_i32(TCGCond cond, TCGv_i32 ret,
TCGv_i32 arg1, int32_t arg2)
{
@@ -1568,18 +1568,6 @@ void tcg_gen_negsetcondi_i64(TCGCond cond, TCGv_i64 ret,
tcg_gen_negsetcond_i64(cond, ret, arg1, tcg_constant_i64(arg2));
}
-void tcg_gen_negsetcond_i64(TCGCond cond, TCGv_i64 ret,
- TCGv_i64 arg1, TCGv_i64 arg2)
-{
- if (cond == TCG_COND_ALWAYS) {
- tcg_gen_movi_i64(ret, -1);
- } else if (cond == TCG_COND_NEVER) {
- tcg_gen_movi_i64(ret, 0);
- } else {
- tcg_gen_op4i_i64(INDEX_op_negsetcond, ret, arg1, arg2, cond);
- }
-}
-
void tcg_gen_ext8s_i64(TCGv_i64 ret, TCGv_i64 arg)
{
tcg_gen_sextract_i64(ret, arg, 0, 8);
--
2.53.0
