Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 3 ---
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 28 ++++++++++------------------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 4cba6cc7448..4476f9dbfb3 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -201,8 +201,6 @@ void tcg_gen_st8_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
void tcg_gen_st16_i32(TCGv_i32 arg1, TCGv_ptr arg2, tcg_target_long offset);
void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2, tcg_target_long offset);
-void tcg_gen_not_i32(TCGv_i32 ret, TCGv_i32 arg);
-
/* 64 bit ops */
void tcg_gen_div_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
@@ -256,7 +254,6 @@ void tcg_gen_addN_i64(int n, TCGv_i64 *r, TCGv_i64 *a,
TCGv_i64 *b);
void tcg_gen_mulu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_muls2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_mulsu2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 arg1, TCGv_i64
arg2);
-void tcg_gen_not_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_ext8s_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_ext16s_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_ext32s_i64(TCGv_i64 ret, TCGv_i64 arg);
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 247db4b15f7..e3935b850cb 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -5,6 +5,7 @@ DEF_RI(movi)
DEF_RIR(subfi)
DEF_RR(mov)
DEF_RR(neg)
+DEF_RR(not)
DEF_RRI(addi)
DEF_RRI(andi)
DEF_RRI(muli)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 3811b6721a2..bf48db8b684 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -440,6 +440,16 @@ static void gen_neg(TCGType type, TCGTemp *dst, TCGTemp
*src)
gen_op_tt(INDEX_op_neg, type, dst, src);
}
+static void gen_not(TCGType type, TCGTemp *dst, TCGTemp *src)
+{
+ if (tcg_op_supported(INDEX_op_not, type, 0)) {
+ gen_op_tt(INDEX_op_not, type, dst, src);
+ } else {
+ /* Do not recurse with gen_xori. */
+ gen_xor(type, dst, src, tcg_constant_internal(type, -1));
+ }
+}
+
static void gen_or(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
gen_op_ttt(INDEX_op_or, type, dst, src1, src2);
@@ -576,15 +586,6 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_not_i32(TCGv_i32 ret, TCGv_i32 arg)
-{
- if (tcg_op_supported(INDEX_op_not, TCG_TYPE_I32, 0)) {
- tcg_gen_op2_i32(INDEX_op_not, ret, arg);
- } else {
- tcg_gen_xori_i32(ret, arg, -1);
- }
-}
-
void tcg_gen_brcond_i32(TCGCond cond, TCGv_i32 arg1, TCGv_i32 arg2, TCGLabel
*l)
{
if (cond == TCG_COND_ALWAYS) {
@@ -1836,15 +1837,6 @@ void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-void tcg_gen_not_i64(TCGv_i64 ret, TCGv_i64 arg)
-{
- if (tcg_op_supported(INDEX_op_not, TCG_TYPE_I64, 0)) {
- tcg_gen_op2_i64(INDEX_op_not, ret, arg);
- } else {
- tcg_gen_xori_i64(ret, arg, -1);
- }
-}
-
void tcg_gen_andc_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
{
if (tcg_op_supported(INDEX_op_andc, TCG_TYPE_I64, 0)) {
--
2.53.0
