Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 7 ++---
tcg/tcg-internal.h | 10 +++++++
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 55 ++++++++++++++++--------------------
4 files changed, 39 insertions(+), 34 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 3eed9e6c2ed..e3d6c9bfd8c 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -100,6 +100,8 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3);
#define DEF4(NAME, T1, T2, T3, T4) \
QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3, T4);
+#define DEF5(NAME, T1, T2, T3, T4, T5) \
+ QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3, T4, T5);
#define DEF6(NAME, T1, T2, T3, T4, T5, T6) \
QEMU_ARG_NONNULL void glue(glue(tcg_gen_,NAME),TExt)(T1, T2, T3, T4, T5,
T6);
@@ -125,12 +127,11 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo);
#undef DEF2
#undef DEF3
#undef DEF4
+#undef DEF5
#undef DEF6
/* 32 bit ops */
-void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,
- unsigned int ofs, unsigned int len);
void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract_i32(TCGv_i32 ret, TCGv_i32 arg,
@@ -180,8 +181,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,
- unsigned int ofs, unsigned int len);
void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract_i64(TCGv_i64 ret, TCGv_i64 arg,
diff --git a/tcg/tcg-internal.h b/tcg/tcg-internal.h
index a0edf112927..13c4be5a5c7 100644
--- a/tcg/tcg-internal.h
+++ b/tcg/tcg-internal.h
@@ -126,6 +126,13 @@ static inline void tcg_gen_op_ttti(TCGOpcode opc, TCGType
type, TCGTemp *t0,
tcg_gen_op4(opc, type, temp_arg(t0), temp_arg(t1), temp_arg(t2), a3);
}
+static inline void tcg_gen_op_tttii(TCGOpcode opc, TCGType type,
+ TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
+ TCGArg a3, TCGArg a4)
+{
+ tcg_gen_op5(opc, type, temp_arg(t0), temp_arg(t1), temp_arg(t2), a3, a4);
+}
+
static inline void tcg_gen_op_ttttt(TCGOpcode opc, TCGType type,
TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4)
@@ -166,6 +173,8 @@ bool tcg_op_imm_match(TCGOpcode op, TCGType type,
tcg_target_ulong imm);
QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3);
#define DEF4(NAME, T1, T2, T3, T4) \
QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3, T4);
+#define DEF5(NAME, T1, T2, T3, T4, T5) \
+ QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3, T4, T5);
#define DEF6(NAME, T1, T2, T3, T4, T5, T6) \
QEMU_ARG_NONNULL void glue(tcg_gen_,NAME)(TCGType, T1, T2, T3, T4, T5, T6);
@@ -181,6 +190,7 @@ bool tcg_op_imm_match(TCGOpcode op, TCGType type,
tcg_target_ulong imm);
#undef DEF2
#undef DEF3
#undef DEF4
+#undef DEF5
#undef DEF6
static inline void tcg_gen_extrh(TCGTemp *dst, TCGTemp *src)
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 9b88373ff23..95885d28d83 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -14,6 +14,7 @@ DEF3(clzi, TCGV, TCGV, TINT)
DEF2(ctpop, TCGV, TCGV)
DEF3(ctz, TCGV, TCGV, TCGV)
DEF3(ctzi, TCGV, TCGV, TINT)
+DEF5(deposit, TCGV, TCGV, TCGV, unsigned, unsigned)
DEF1(discard, TCGV)
DEF3(div, TCGV, TCGV, TCGV)
DEF3(divu, TCGV, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index dc6079a9e45..f5771240803 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -296,6 +296,11 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
{ tcg_gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), \
glue(C_,T3)(c), glue(C_,T4)(d)); }
+#define DEF5(NAME, T1, T2, T3, T4, T5) \
+ void glue(glue(tcg_gen_,NAME),TExt)(T1 a, T2 b, T3 c, T4 d, T5 e) \
+ { tcg_gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), \
+ glue(C_,T3)(c), glue(C_,T4)(d), glue(C_,T5)(e)); }
+
#define DEF6(NAME, T1, T2, T3, T4, T5, T6) \
void glue(glue(tcg_gen_,NAME),TExt)(T1 a, T2 b, T3 c, T4 d, T5 e, T6 f) \
{ tcg_gen_##NAME(TYPE, glue(C_,T1)(a), glue(C_,T2)(b), glue(C_,T3)(c), \
@@ -307,6 +312,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#define C_int64_t
#define C_TCGCond
#define C_TCGLabelPtr
+#define C_unsigned
#define TCGV glue(TCGv,TExt)
#define TExt _i32
@@ -336,11 +342,13 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo)
#undef C_int64_t
#undef C_TCGCond
#undef C_TCGLabelPtr
+#undef C_unsigned
#undef DEF1
#undef DEF2
#undef DEF3
#undef DEF4
+#undef DEF5
#undef DEF6
/*
@@ -539,6 +547,23 @@ void tcg_gen_ctzi(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
tcg_gen_ctz(type, dst, src1, tcg_constant_internal(type, src2));
}
+void tcg_gen_deposit(TCGType type, TCGTemp *dst, TCGTemp *src1,
+ TCGTemp *src2, unsigned ofs, unsigned len)
+{
+ unsigned width = tcg_type_size(type) * 8;
+
+ tcg_debug_assert(ofs < width);
+ tcg_debug_assert(len > 0);
+ tcg_debug_assert(len <= width);
+ tcg_debug_assert(ofs + len <= width);
+
+ if (len == width) {
+ tcg_gen_mov(type, dst, src2);
+ } else {
+ tcg_gen_op_tttii(INDEX_op_deposit, type, dst, src1, src2, ofs, len);
+ }
+}
+
void tcg_gen_discard(TCGType type, TCGTemp *src)
{
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
@@ -921,21 +946,6 @@ void tcg_gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_deposit_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2,
- unsigned int ofs, unsigned int len)
-{
- tcg_debug_assert(ofs < 32);
- tcg_debug_assert(len > 0);
- tcg_debug_assert(len <= 32);
- tcg_debug_assert(ofs + len <= 32);
-
- if (len == 32) {
- tcg_gen_mov_i32(ret, arg2);
- } else {
- tcg_gen_op5ii_i32(INDEX_op_deposit, ret, arg1, arg2, ofs, len);
- }
-}
-
void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len)
{
@@ -1683,21 +1693,6 @@ void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-void tcg_gen_deposit_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2,
- unsigned int ofs, unsigned int len)
-{
- tcg_debug_assert(ofs < 64);
- tcg_debug_assert(len > 0);
- tcg_debug_assert(len <= 64);
- tcg_debug_assert(ofs + len <= 64);
-
- if (len == 64) {
- tcg_gen_mov_i64(ret, arg2);
- } else {
- tcg_gen_op5ii_i64(INDEX_op_deposit, ret, arg1, arg2, ofs, len);
- }
-}
-
void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len)
{
--
2.53.0
