Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 6 +++---
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 33 +++++++++++++--------------------
3 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index fd603b2de7f..1ef342e6c44 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -92,6 +92,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
* Construct operations from templates.
*/
+#define DEF1(NAME, T1) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(T1);
#define DEF2(NAME, T1, T2) \
void glue(glue(tcg_gen_,NAME),TEXT)(T1, T2);
@@ -113,6 +115,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#undef TINT
#undef TCGV
+#undef DEF1
#undef DEF2
/* 32 bit ops */
@@ -197,8 +200,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);
@@ -317,7 +318,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-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 5de7648ed48..6ff97260dc6 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -1,4 +1,5 @@
/* SPDX-License-Identifier: MIT */
+DEF1(discard, TCGV)
DEF2(mov, TCGV, TCGV)
DEF2(movi, TCGV, TINT)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 82f15205c36..88f06afafab 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,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
* Forward declarations of generic expansions.
*/
+#define DEF1(NAME, T1) \
+ static void glue(gen_,NAME)(TCGType, T1);
#define DEF2(NAME, T1, T2) \
static void glue(gen_,NAME)(TCGType, T1, T2);
@@ -335,12 +327,17 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo)
#undef TINT
#undef TCGV
+#undef DEF1
#undef DEF2
/*
* Templated operations.
*/
+#define DEF1(NAME, T1) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(T1 a) \
+ { gen_##NAME(TYPE, glue(C_,T1)(a)); }
+
#define DEF2(NAME, T1, T2) \
void glue(glue(tcg_gen_,NAME),TEXT)(T1 a, T2 b) \
{ gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b)); }
@@ -377,6 +374,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef C_int32_t
#undef C_int64_t
+#undef DEF1
#undef DEF2
/*
@@ -385,6 +383,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) {
@@ -399,11 +402,6 @@ static void gen_movi(TCGType type, TCGTemp *dst, int64_t
src)
/* 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);
@@ -1461,11 +1459,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
