Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 9 ++---
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 66 +++++++++++++++++++----------------
3 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index df7999e92cf..eae8bbd129d 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -126,6 +126,10 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo);
void glue(glue(tcg_gen_,NAME),TEXT)(TCGCond a, TCGV b, TCGV c, \
TCGV d, TCGV e, TCGV f);
+#define DEF_RRRUU(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
+ unsigned d, unsigned e);
+
#include "tcg-op-def.h.inc"
#undef DEF_R
@@ -139,11 +143,10 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo);
#undef DEF_CRRR
#undef DEF_CRRI
#undef DEF_CRRRRR
+#undef DEF_RRRUU
/* 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,
@@ -193,8 +196,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/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index dd66a2ecd8d..415d10b9fe9 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -50,3 +50,4 @@ DEF_RRR(shl)
DEF_RRR(shr)
DEF_RRR(sub)
DEF_RRR(xor)
+DEF_RRRUU(deposit)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 8add0836952..61700f0d620 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -127,6 +127,14 @@ static TCGOp *gen_op_ttti(TCGOpcode opc, TCGType type,
return tcg_gen_op4(opc, type, temp_arg(t0), temp_arg(t1), temp_arg(t2),
a3);
}
+static TCGOp *gen_op_tttii(TCGOpcode opc, TCGType type,
+ TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
+ TCGArg a3, TCGArg a4)
+{
+ return tcg_gen_op5(opc, type, temp_arg(t0), temp_arg(t1),
+ temp_arg(t2), a3, a4);
+}
+
static TCGOp *gen_op_ttttt(TCGOpcode opc, TCGType type,
TCGTemp *t0, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4)
@@ -352,6 +360,10 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
static void glue(gen_,NAME)(TCGType, TCGCond, TCGTemp *, TCGTemp *, \
TCGTemp *, TCGTemp *, TCGTemp *);
+#define DEF_RRRUU(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, TCGTemp *, \
+ unsigned, unsigned);
+
#include "tcg/tcg-op-def2.h.inc"
#undef DEF_R
@@ -365,6 +377,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_CRRR
#undef DEF_CRRI
#undef DEF_CRRRRR
+#undef DEF_RRRUU
static void gen_extrh_i64_i32(TCGTemp *dst, TCGTemp *src);
static void gen_extrl_i64_i32(TCGTemp *dst, TCGTemp *src);
@@ -575,6 +588,23 @@ static void gen_ctzi(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
gen_ctz(type, dst, src1, tcg_constant_internal(type, src2));
}
+static void 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) {
+ gen_mov(type, dst, src2);
+ } else {
+ gen_op_tttii(INDEX_op_deposit, type, dst, src1, src2, ofs, len);
+ }
+}
+
static void gen_discard(TCGType type, TCGTemp *src)
{
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
@@ -1032,6 +1062,11 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
TCGV d, TCGV e, TCGV f) \
{ gen_##NAME(TYPE, a, TTMP(b), TTMP(c), TTMP(d), TTMP(e), TTMP(f)); }
+#define DEF_RRRUU(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
+ unsigned d, unsigned e) \
+ { gen_##NAME(TYPE, TTMP(a), TTMP(b), TTMP(c), d, e); }
+
#include "tcg/tcg-op-def.h.inc"
#undef DEF_R
@@ -1045,24 +1080,10 @@ static void gen_xori(TCGType type, TCGTemp *dst,
TCGTemp *src1, int64_t src2)
#undef DEF_CRRR
#undef DEF_CRRI
#undef DEF_CRRRRR
+#undef DEF_RRRUU
/* 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)
{
@@ -1810,21 +1831,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
