Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 8 +-
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 141 +++++++++++++---------------------
3 files changed, 60 insertions(+), 90 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index eae8bbd129d..0a37a8edb60 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -126,6 +126,9 @@ 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_RRUU(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, unsigned c, unsigned
d);
+
#define DEF_RRRUU(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
unsigned d, unsigned e);
@@ -143,14 +146,13 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo);
#undef DEF_CRRR
#undef DEF_CRRI
#undef DEF_CRRRRR
+#undef DEF_RRUU
#undef DEF_RRRUU
/* 32 bit ops */
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,
- unsigned int ofs, unsigned int len);
void tcg_gen_sextract_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al, TCGv_i32 ah,
@@ -198,8 +200,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
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,
- unsigned int ofs, unsigned int len);
void tcg_gen_sextract_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len);
void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, TCGv_i64 ah,
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 415d10b9fe9..24db95e294d 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -51,3 +51,4 @@ DEF_RRR(shr)
DEF_RRR(sub)
DEF_RRR(xor)
DEF_RRRUU(deposit)
+DEF_RRUU(extract)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 61700f0d620..d196c36fc4f 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -360,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_RRUU(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, \
+ unsigned, unsigned);
+
#define DEF_RRRUU(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, TCGTemp *, \
unsigned, unsigned);
@@ -377,6 +381,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_CRRR
#undef DEF_CRRI
#undef DEF_CRRRRR
+#undef DEF_RRUU
#undef DEF_RRRUU
static void gen_extrh_i64_i32(TCGTemp *dst, TCGTemp *src);
@@ -651,6 +656,50 @@ static void gen_eqv(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
}
}
+static void gen_extract(TCGType type, TCGTemp *dst, TCGTemp *src,
+ unsigned int ofs, unsigned int len)
+{
+ unsigned width = tcg_type_size(type) * 8;
+ uint64_t mask;
+
+ tcg_debug_assert(ofs < width);
+ tcg_debug_assert(len > 0);
+ tcg_debug_assert(len <= width);
+ tcg_debug_assert(ofs + len <= width);
+
+ /* Canonicalize certain special cases, even if extract is supported. */
+ if (ofs + len == width) {
+ gen_shri(type, dst, src, width - len);
+ return;
+ }
+
+ if (TCG_TARGET_extract_valid(type, ofs, len)) {
+ gen_op_ttii(INDEX_op_extract, type, dst, src, ofs, len);
+ return;
+ }
+
+ mask = MAKE_64BIT_MASK(0, len);
+ if (ofs == 0) {
+ gen_andi(type, dst, src, mask);
+ return;
+ }
+
+ /* Assume that zero-extension, if available, is cheaper than a shift. */
+ if (TCG_TARGET_extract_valid(type, 0, ofs + len)) {
+ gen_op_ttii(INDEX_op_extract, type, dst, src, 0, ofs + len);
+ gen_shri(type, dst, dst, ofs);
+ return;
+ }
+
+ if (tcg_op_imm_match(INDEX_op_and, type, mask)) {
+ gen_shri(type, dst, src, ofs);
+ gen_andi(type, dst, dst, mask);
+ } else {
+ gen_shli(type, dst, src, width - len - ofs);
+ gen_shri(type, dst, dst, width - len);
+ }
+}
+
static void gen_extrh_i64_i32(TCGTemp *dst, TCGTemp *src)
{
gen_op_tt(INDEX_op_extrh_i64_i32, TCG_TYPE_I32, dst, src);
@@ -1062,6 +1111,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_RRUU(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, \
+ unsigned c, unsigned d) \
+ { gen_##NAME(TYPE, TTMP(a), TTMP(b), c, d); }
+
#define DEF_RRRUU(NAME) \
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
unsigned d, unsigned e) \
@@ -1080,6 +1134,7 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
#undef DEF_CRRR
#undef DEF_CRRI
#undef DEF_CRRRRR
+#undef DEF_RRUU
#undef DEF_RRRUU
/* 32 bit ops */
@@ -1102,49 +1157,6 @@ void tcg_gen_deposit_z_i32(TCGv_i32 ret, TCGv_i32 arg,
}
}
-void tcg_gen_extract_i32(TCGv_i32 ret, TCGv_i32 arg,
- unsigned int ofs, unsigned int len)
-{
- uint32_t mask;
-
- tcg_debug_assert(ofs < 32);
- tcg_debug_assert(len > 0);
- tcg_debug_assert(len <= 32);
- tcg_debug_assert(ofs + len <= 32);
-
- /* Canonicalize certain special cases, even if extract is supported. */
- if (ofs + len == 32) {
- tcg_gen_shri_i32(ret, arg, 32 - len);
- return;
- }
-
- if (TCG_TARGET_extract_valid(TCG_TYPE_I32, ofs, len)) {
- tcg_gen_op4ii_i32(INDEX_op_extract, ret, arg, ofs, len);
- return;
- }
-
- mask = (1u << len) - 1;
- if (ofs == 0) {
- tcg_gen_andi_i32(ret, arg, mask);
- return;
- }
-
- /* Assume that zero-extension, if available, is cheaper than a shift. */
- if (TCG_TARGET_extract_valid(TCG_TYPE_I32, 0, ofs + len)) {
- tcg_gen_op4ii_i32(INDEX_op_extract, ret, arg, 0, ofs + len);
- tcg_gen_shri_i32(ret, ret, ofs);
- return;
- }
-
- if (tcg_op_imm_match(INDEX_op_and, TCG_TYPE_I32, mask)) {
- tcg_gen_shri_i32(ret, arg, ofs);
- tcg_gen_andi_i32(ret, ret, mask);
- } else {
- tcg_gen_shli_i32(ret, arg, 32 - len - ofs);
- tcg_gen_shri_i32(ret, ret, 32 - len);
- }
-}
-
void tcg_gen_sextract_i32(TCGv_i32 ret, TCGv_i32 arg,
unsigned int ofs, unsigned int len)
{
@@ -1849,49 +1861,6 @@ void tcg_gen_deposit_z_i64(TCGv_i64 ret, TCGv_i64 arg,
}
}
-void tcg_gen_extract_i64(TCGv_i64 ret, TCGv_i64 arg,
- unsigned int ofs, unsigned int len)
-{
- uint64_t mask;
-
- tcg_debug_assert(ofs < 64);
- tcg_debug_assert(len > 0);
- tcg_debug_assert(len <= 64);
- tcg_debug_assert(ofs + len <= 64);
-
- /* Canonicalize certain special cases, even if extract is supported. */
- if (ofs + len == 64) {
- tcg_gen_shri_i64(ret, arg, 64 - len);
- return;
- }
-
- if (TCG_TARGET_extract_valid(TCG_TYPE_I64, ofs, len)) {
- tcg_gen_op4ii_i64(INDEX_op_extract, ret, arg, ofs, len);
- return;
- }
-
- mask = (1ull << len) - 1;
- if (ofs == 0) {
- tcg_gen_andi_i64(ret, arg, mask);
- return;
- }
-
- /* Assume that zero-extension, if available, is cheaper than a shift. */
- if (TCG_TARGET_extract_valid(TCG_TYPE_I64, 0, ofs + len)) {
- tcg_gen_op4ii_i64(INDEX_op_extract, ret, arg, 0, ofs + len);
- tcg_gen_shri_i64(ret, ret, ofs);
- return;
- }
-
- if (tcg_op_imm_match(INDEX_op_and, TCG_TYPE_I64, mask)) {
- tcg_gen_shri_i64(ret, arg, ofs);
- tcg_gen_andi_i64(ret, ret, mask);
- } else {
- tcg_gen_shli_i64(ret, arg, 64 - len - ofs);
- tcg_gen_shri_i64(ret, ret, 64 - len);
- }
-}
-
void tcg_gen_sextract_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned int ofs, unsigned int len)
{
--
2.53.0
