Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 6 ++++--
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 30 ++++++++++++++++++++----------
3 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index c0de3f9f45e..ab0c3f9554c 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -98,6 +98,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#define DEF_RR(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b);
+#define DEF_RRR(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c);
+
#define DEF_RI(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TINT b);
@@ -105,6 +108,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef DEF_R
#undef DEF_RR
+#undef DEF_RRR
#undef DEF_RI
/* 32 bit ops */
@@ -199,7 +203,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_add_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_sub_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_and_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_or_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -304,7 +307,6 @@ void tcg_gen_st8_i64(TCGv_i64 arg1, TCGv_ptr arg2,
tcg_target_long offset);
void tcg_gen_st16_i64(TCGv_i64 arg1, TCGv_ptr arg2, tcg_target_long offset);
void tcg_gen_st32_i64(TCGv_i64 arg1, TCGv_ptr arg2, tcg_target_long offset);
-void tcg_gen_add_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_sub_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_ld8u_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset);
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 7943746a44a..e36fd296a30 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -3,3 +3,4 @@
DEF_R(discard)
DEF_RI(movi)
DEF_RR(mov)
+DEF_RRR(add)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index d796016ca26..30c84d348c9 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -109,6 +109,12 @@ static void gen_op_tt(TCGOpcode opc, TCGType type, TCGTemp
*t0, TCGTemp *t1)
tcg_gen_op2(opc, type, temp_arg(t0), temp_arg(t1));
}
+static TCGOp *gen_op_ttt(TCGOpcode opc, TCGType type,
+ TCGTemp *t0, TCGTemp *t1, TCGTemp *t2)
+{
+ return tcg_gen_op3(opc, type, temp_arg(t0), temp_arg(t1), temp_arg(t2));
+}
+
/*
* With CONFIG_DEBUG_TCG, tcgv_*_tmp via tcgv_*_arg, is an out-of-line
* assertion check. Force tail calls to avoid too much code expansion.
@@ -320,6 +326,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#define DEF_RR(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *);
+#define DEF_RRR(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, TCGTemp *);
+
#define DEF_RI(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, int64_t);
@@ -327,6 +336,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_R
#undef DEF_RR
+#undef DEF_RRR
#undef DEF_RI
/*
@@ -335,6 +345,11 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
* are of the proper type.
*/
+static void gen_add(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
+{
+ gen_op_ttt(INDEX_op_add, type, dst, src1, src2);
+}
+
static void gen_discard(TCGType type, TCGTemp *src)
{
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
@@ -364,6 +379,10 @@ static void gen_movi(TCGType type, TCGTemp *dst, int64_t
src)
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b) \
{ gen_##NAME(TYPE, TTMP(a), TTMP(b)); }
+#define DEF_RRR(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c) \
+ { gen_##NAME(TYPE, TTMP(a), TTMP(b), TTMP(c)); }
+
#define DEF_RI(NAME) \
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TINT b) \
{ gen_##NAME(TYPE, TTMP(a), b); }
@@ -372,15 +391,11 @@ static void gen_movi(TCGType type, TCGTemp *dst, int64_t
src)
#undef DEF_R
#undef DEF_RR
+#undef DEF_RRR
#undef DEF_RI
/* 32 bit ops */
-void tcg_gen_add_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
-{
- tcg_gen_op3_i32(INDEX_op_add, ret, arg1, arg2);
-}
-
void tcg_gen_addi_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2)
{
/* some cases can be optimized here */
@@ -1488,11 +1503,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_add_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
-{
- tcg_gen_op3_i64(INDEX_op_add, ret, arg1, arg2);
-}
-
void tcg_gen_sub_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
{
tcg_gen_op3_i64(INDEX_op_sub, ret, arg1, arg2);
--
2.53.0
