Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 7 ++++---
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 34 ++++++++++++++--------------------
3 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 5fc8b43d083..c0de3f9f45e 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -92,6 +92,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
* Construct operations from templates.
*/
+#define DEF_R(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a);
+
#define DEF_RR(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b);
@@ -100,6 +103,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#include "tcg-op-def.h.inc"
+#undef DEF_R
#undef DEF_RR
#undef DEF_RI
@@ -185,8 +189,6 @@ void tcg_gen_revbit32_i32(TCGv_i32 ret, TCGv_i32 arg);
/* Replicate a value of size @vece from @in to all the lanes in @out */
void tcg_gen_dup_i32(unsigned vece, TCGv_i32 out, TCGv_i32 in);
-void tcg_gen_discard_i32(TCGv_i32 arg);
-
void tcg_gen_ld8u_i32(TCGv_i32 ret, TCGv_ptr arg2, tcg_target_long offset);
void tcg_gen_ld8s_i32(TCGv_i32 ret, TCGv_ptr arg2, tcg_target_long offset);
void tcg_gen_ld16u_i32(TCGv_i32 ret, TCGv_ptr arg2, tcg_target_long offset);
@@ -305,7 +307,6 @@ 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_discard_i64(TCGv_i64 arg);
void tcg_gen_ld8u_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset);
void tcg_gen_ld8s_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset);
void tcg_gen_ld16u_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 0f8ee5f9976..7943746a44a 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -1,4 +1,5 @@
/* SPDX-License-Identifier: MIT */
+DEF_R(discard)
DEF_RI(movi)
DEF_RR(mov)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 8350110ebae..d796016ca26 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -119,16 +119,6 @@ static void gen_op_tt(TCGOpcode opc, TCGType type, TCGTemp
*t0, TCGTemp *t1)
# define DNI
#endif
-static void DNI tcg_gen_op1_i32(TCGOpcode opc, TCGType type, TCGv_i32 a1)
-{
- tcg_gen_op1(opc, type, tcgv_i32_arg(a1));
-}
-
-static void DNI tcg_gen_op1_i64(TCGOpcode opc, TCGType type, TCGv_i64 a1)
-{
- tcg_gen_op1(opc, type, tcgv_i64_arg(a1));
-}
-
static TCGOp * DNI tcg_gen_op1i(TCGOpcode opc, TCGType type, TCGArg a1)
{
return tcg_gen_op1(opc, type, a1);
@@ -324,6 +314,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
* Forward declarations of generic expansions.
*/
+#define DEF_R(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *);
+
#define DEF_RR(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *);
@@ -332,6 +325,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#include "tcg/tcg-op-def2.h.inc"
+#undef DEF_R
#undef DEF_RR
#undef DEF_RI
@@ -341,6 +335,11 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
* are of the proper type.
*/
+static void gen_discard(TCGType type, TCGTemp *src)
+{
+ tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
+}
+
static void gen_mov(TCGType type, TCGTemp *dst, TCGTemp *src)
{
if (src != dst) {
@@ -357,6 +356,10 @@ static void gen_movi(TCGType type, TCGTemp *dst, int64_t
src)
* Templated operations.
*/
+#define DEF_R(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a) \
+ { gen_##NAME(TYPE, TTMP(a)); }
+
#define DEF_RR(NAME) \
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b) \
{ gen_##NAME(TYPE, TTMP(a), TTMP(b)); }
@@ -367,16 +370,12 @@ static void gen_movi(TCGType type, TCGTemp *dst, int64_t
src)
#include "tcg/tcg-op-def.h.inc"
+#undef DEF_R
#undef DEF_RR
#undef DEF_RI
/* 32 bit ops */
-void tcg_gen_discard_i32(TCGv_i32 arg)
-{
- tcg_gen_op1_i32(INDEX_op_discard, TCG_TYPE_I32, arg);
-}
-
void tcg_gen_add_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
{
tcg_gen_op3_i32(INDEX_op_add, ret, arg1, arg2);
@@ -1434,11 +1433,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset)
/* 64-bit ops */
-void tcg_gen_discard_i64(TCGv_i64 arg)
-{
- tcg_gen_op1_i64(INDEX_op_discard, TCG_TYPE_I64, arg);
-}
-
void tcg_gen_ld8u_i64(TCGv_i64 ret, TCGv_ptr arg2, tcg_target_long offset)
{
tcg_gen_ldst_op_i64(INDEX_op_ld8u, ret, arg2, offset);
--
2.53.0
