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 | 84 +++++++++++++----------------------
3 files changed, 35 insertions(+), 58 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 903949e18b8..489121d478c 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -129,6 +129,9 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
#define DEF_RRUU(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, unsigned c, unsigned
d);
+#define DEF_RRRU(NAME) \
+ void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, unsigned d);
+
#define DEF_RRRUU(NAME) \
void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
unsigned d, unsigned e);
@@ -147,12 +150,11 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned
meminfo);
#undef DEF_CRRI
#undef DEF_CRRRRR
#undef DEF_RRUU
+#undef DEF_RRRU
#undef DEF_RRRUU
/* 32 bit ops */
-void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al, TCGv_i32 ah,
- unsigned int ofs);
void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
TCGv_i32 ah, TCGv_i32 bl, TCGv_i32 bh);
void tcg_gen_sub2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
@@ -184,8 +186,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, TCGv_i64 ah,
- unsigned int ofs);
void tcg_gen_add2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh);
void tcg_gen_sub2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 19e1eb38dfb..187cffbdf4d 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -60,6 +60,7 @@ DEF_RRR(umax)
DEF_RRR(umin)
DEF_RRR(ussub)
DEF_RRR(xor)
+DEF_RRRU(extract2)
DEF_RRRUU(deposit)
DEF_RRUU(deposit_z)
DEF_RRUU(extract)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 49c187c3784..3fd9d8bb92c 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -230,20 +230,6 @@ static void DNI tcg_gen_op4_i64(TCGOpcode opc, TCGv_i64
a1, TCGv_i64 a2,
tcgv_i64_arg(a3), tcgv_i64_arg(a4));
}
-static void DNI tcg_gen_op4i_i32(TCGOpcode opc, TCGv_i32 a1, TCGv_i32 a2,
- TCGv_i32 a3, TCGArg a4)
-{
- tcg_gen_op4(opc, TCG_TYPE_I32, tcgv_i32_arg(a1), tcgv_i32_arg(a2),
- tcgv_i32_arg(a3), a4);
-}
-
-static void DNI tcg_gen_op4i_i64(TCGOpcode opc, TCGv_i64 a1, TCGv_i64 a2,
- TCGv_i64 a3, TCGArg a4)
-{
- tcg_gen_op4(opc, TCG_TYPE_I64, tcgv_i64_arg(a1), tcgv_i64_arg(a2),
- tcgv_i64_arg(a3), a4);
-}
-
/* Generic ops. */
void gen_set_label(TCGLabel *l)
@@ -336,6 +322,10 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, \
unsigned, unsigned);
+#define DEF_RRRU(NAME) \
+ static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, \
+ TCGTemp *, unsigned);
+
#define DEF_RRRUU(NAME) \
static void glue(gen_,NAME)(TCGType, TCGTemp *, TCGTemp *, TCGTemp *, \
unsigned, unsigned);
@@ -354,6 +344,7 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo)
#undef DEF_CRRI
#undef DEF_CRRRRR
#undef DEF_RRUU
+#undef DEF_RRRU
#undef DEF_RRRUU
static void gen_extrh_i64_i32(TCGTemp *dst, TCGTemp *src);
@@ -728,6 +719,23 @@ static void gen_extract(TCGType type, TCGTemp *dst,
TCGTemp *src,
}
}
+static void gen_extract2(TCGType type, TCGTemp *dst, TCGTemp *lo, TCGTemp *hi,
+ unsigned int ofs)
+{
+ unsigned width = tcg_type_size(type) * 8;
+
+ tcg_debug_assert(ofs <= width);
+ if (ofs == 0) {
+ gen_mov(type, dst, lo);
+ } else if (ofs == width) {
+ gen_mov(type, dst, hi);
+ } else if (lo == hi) {
+ gen_rotri(type, dst, lo, ofs);
+ } else {
+ gen_op_ttti(INDEX_op_extract2, type, dst, lo, hi, ofs);
+ }
+}
+
static void gen_extrh_i64_i32(TCGTemp *dst, TCGTemp *src)
{
gen_op_tt(INDEX_op_extrh_i64_i32, TCG_TYPE_I32, dst, src);
@@ -1232,6 +1240,11 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
unsigned c, unsigned d) \
{ gen_##NAME(TYPE, TTMP(a), TTMP(b), c, d); }
+#define DEF_RRRU(NAME) \
+ DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
+ unsigned d) \
+ { gen_##NAME(TYPE, TTMP(a), TTMP(b), TTMP(c), d); }
+
#define DEF_RRRUU(NAME) \
DNI void glue(glue(tcg_gen_,NAME),TEXT)(TCGV a, TCGV b, TCGV c, \
unsigned d, unsigned e) \
@@ -1251,6 +1264,7 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
#undef DEF_CRRI
#undef DEF_CRRRRR
#undef DEF_RRUU
+#undef DEF_RRRU
#undef DEF_RRRUU
static void gen_ext(TCGType type, TCGTemp *dst, TCGTemp *src, MemOp mop)
@@ -1264,27 +1278,6 @@ static void gen_ext(TCGType type, TCGTemp *dst, TCGTemp
*src, MemOp mop)
}
}
-/* 32 bit ops */
-
-/*
- * Extract 32-bits from a 64-bit input, ah:al, starting from ofs.
- * Unlike tcg_gen_extract_i32 above, len is fixed at 32.
- */
-void tcg_gen_extract2_i32(TCGv_i32 ret, TCGv_i32 al, TCGv_i32 ah,
- unsigned int ofs)
-{
- tcg_debug_assert(ofs <= 32);
- if (ofs == 0) {
- tcg_gen_mov_i32(ret, al);
- } else if (ofs == 32) {
- tcg_gen_mov_i32(ret, ah);
- } else if (al == ah) {
- tcg_gen_rotri_i32(ret, al, ofs);
- } else {
- tcg_gen_op4i_i32(INDEX_op_extract2, ret, al, ah, ofs);
- }
-}
-
void tcg_gen_ext_i32(TCGv_i32 dst, TCGv_i32 src, MemOp mop)
{
gen_ext(TCG_TYPE_I32, tcgv_i32_temp(dst), tcgv_i32_temp(src), mop);
@@ -1295,6 +1288,8 @@ void tcg_gen_ext_i64(TCGv_i64 dst, TCGv_i64 src, MemOp
mop)
gen_ext(TCG_TYPE_I64, tcgv_i64_temp(dst), tcgv_i64_temp(src), mop);
}
+/* 32 bit ops */
+
void tcg_gen_add2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 al,
TCGv_i32 ah, TCGv_i32 bl, TCGv_i32 bh)
{
@@ -1831,25 +1826,6 @@ void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-/*
- * Extract 64 bits from a 128-bit input, ah:al, starting from ofs.
- * Unlike tcg_gen_extract_i64 above, len is fixed at 64.
- */
-void tcg_gen_extract2_i64(TCGv_i64 ret, TCGv_i64 al, TCGv_i64 ah,
- unsigned int ofs)
-{
- tcg_debug_assert(ofs <= 64);
- if (ofs == 0) {
- tcg_gen_mov_i64(ret, al);
- } else if (ofs == 64) {
- tcg_gen_mov_i64(ret, ah);
- } else if (al == ah) {
- tcg_gen_rotri_i64(ret, al, ofs);
- } else {
- tcg_gen_op4i_i64(INDEX_op_extract2, ret, al, ah, ofs);
- }
-}
-
void tcg_gen_add2_i64(TCGv_i64 rl, TCGv_i64 rh, TCGv_i64 al,
TCGv_i64 ah, TCGv_i64 bl, TCGv_i64 bh)
{
--
2.53.0
