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 | 40 +++++++++++------------------------
3 files changed, 13 insertions(+), 30 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index b47d33d723f..742af3665db 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -121,7 +121,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_xori_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
void tcg_gen_muli_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
void tcg_gen_div_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_rem_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -207,7 +206,6 @@ void tcg_gen_not_i32(TCGv_i32 ret, TCGv_i32 arg);
/* 64 bit ops */
-void tcg_gen_xori_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
void tcg_gen_muli_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
void tcg_gen_div_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_rem_i64(TCGv_i64 ret, 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 07e1a9bedd9..250ab78ec0e 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -12,6 +12,7 @@ DEF_RRI(sari)
DEF_RRI(shli)
DEF_RRI(shri)
DEF_RRI(subi)
+DEF_RRI(xori)
DEF_RRR(add)
DEF_RRR(and)
DEF_RRR(mul)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index ce358bbff26..442c8e25927 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -514,6 +514,18 @@ static void gen_xor(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
gen_op_ttt(INDEX_op_xor, type, dst, src1, src2);
}
+static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp *src1, int64_t src2)
+{
+ if (src2 == 0) {
+ gen_mov(type, dst, src1);
+ } else if (src2 == -1 && tcg_op_supported(INDEX_op_not, type, 0)) {
+ /* Do not recurse with gen_not. */
+ gen_op_tt(INDEX_op_not, type, dst, src1);
+ } else {
+ gen_xor(type, dst, src1, tcg_constant_internal(type, src2));
+ }
+}
+
/*
* Templated operations.
*/
@@ -553,20 +565,6 @@ static void gen_xor(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
/* 32 bit ops */
-void tcg_gen_xori_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2)
-{
- /* Some cases can be optimized here. */
- if (arg2 == 0) {
- tcg_gen_mov_i32(ret, arg1);
- } else if (arg2 == -1 &&
- tcg_op_supported(INDEX_op_not, TCG_TYPE_I32, 0)) {
- /* Don't recurse with tcg_gen_not_i32. */
- tcg_gen_op2_i32(INDEX_op_not, ret, arg1);
- } else {
- tcg_gen_xor_i32(ret, arg1, tcg_constant_i32(arg2));
- }
-}
-
void tcg_gen_not_i32(TCGv_i32 ret, TCGv_i32 arg)
{
if (tcg_op_supported(INDEX_op_not, TCG_TYPE_I32, 0)) {
@@ -1519,20 +1517,6 @@ void tcg_gen_st_i64(TCGv_i64 arg1, TCGv_ptr arg2,
tcg_target_long offset)
tcg_gen_ldst_op_i64(INDEX_op_st, arg1, arg2, offset);
}
-void tcg_gen_xori_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2)
-{
- /* Some cases can be optimized here. */
- if (arg2 == 0) {
- tcg_gen_mov_i64(ret, arg1);
- } else if (arg2 == -1 &&
- tcg_op_supported(INDEX_op_not, TCG_TYPE_I64, 0)) {
- /* Don't recurse with tcg_gen_not_i64. */
- tcg_gen_op2_i64(INDEX_op_not, ret, arg1);
- } else {
- tcg_gen_xor_i64(ret, arg1, tcg_constant_i64(arg2));
- }
-}
-
void tcg_gen_brcond_i64(TCGCond cond, TCGv_i64 arg1, TCGv_i64 arg2, TCGLabel
*l)
{
if (cond == TCG_COND_ALWAYS) {
--
2.53.0
