Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 --
include/tcg/tcg-op-def.h.inc | 1 +
tcg/tcg-op.c | 51 +++++++++++++-----------------------
3 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index c36ad34b0d2..1829fd3a0d6 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -135,7 +135,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
void tcg_gen_mulsu2_i32(TCGv_i32 rl, TCGv_i32 rh, TCGv_i32 arg1, TCGv_i32
arg2);
void tcg_gen_bswap32_i32(TCGv_i32 ret, TCGv_i32 arg);
void tcg_gen_hswap_i32(TCGv_i32 ret, TCGv_i32 arg);
-void tcg_gen_revbit8_i32(TCGv_i32 ret, TCGv_i32 arg);
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 */
@@ -161,7 +160,6 @@ void tcg_gen_bswap32_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned flags);
void tcg_gen_bswap64_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_hswap_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_wswap_i64(TCGv_i64 ret, TCGv_i64 arg);
-void tcg_gen_revbit8_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_revbit32_i64(TCGv_i64 ret, TCGv_i64 arg, unsigned flags);
void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg);
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 28cfa68db3e..13aa8e15e42 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -48,6 +48,7 @@ DEF3(ori, TCGV, TCGV, TINT)
DEF3(orc, TCGV, TCGV, TCGV)
DEF3(rem, TCGV, TCGV, TCGV)
DEF3(remu, TCGV, TCGV, TCGV)
+DEF2(revbit8, TCGV, TCGV)
DEF3(rotl, TCGV, TCGV, TCGV)
DEF3(rotli, TCGV, TCGV, TINT)
DEF3(rotr, TCGV, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index 1882c0b5f3c..e5b3ca1bfe0 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -179,11 +179,6 @@ static TCGOp * DNI tcg_gen_op1i(TCGOpcode opc, TCGType
type, TCGArg a1)
return tcg_gen_op1(opc, type, a1);
}
-static void DNI tcg_gen_op2_i32(TCGOpcode opc, TCGv_i32 a1, TCGv_i32 a2)
-{
- tcg_gen_op2(opc, TCG_TYPE_I32, tcgv_i32_arg(a1), tcgv_i32_arg(a2));
-}
-
static void DNI tcg_gen_op2_i64(TCGOpcode opc, TCGv_i64 a1, TCGv_i64 a2)
{
tcg_gen_op2(opc, TCG_TYPE_I64, tcgv_i64_arg(a1), tcgv_i64_arg(a2));
@@ -1175,6 +1170,24 @@ static void gen_remu(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
}
}
+static void gen_revbit8(TCGType type, TCGTemp *dst, TCGTemp *src)
+{
+ static const TCGOpcode revw[2] = { INDEX_op_revbit32, INDEX_op_revbit64 };
+ static const TCGOpcode bswapw[2] = { INDEX_op_bswap32, INDEX_op_bswap64 };
+
+ if (tcg_op_supported(INDEX_op_revbit8, type, 0)) {
+ gen_op_tt(INDEX_op_revbit8, type, dst, src);
+ } else if (tcg_op_supported(revw[type], type, 0) &&
+ tcg_op_supported(bswapw[type], type, 0)) {
+ gen_op_tt(revw[type], type, dst, src);
+ gen_op_tti(bswapw[type], type, dst, dst, 0);
+ } else {
+ gen_bitswap(type, dst, src, 0x5555555555555555ull);
+ gen_bitswap(type, dst, dst, 0x3333333333333333ull);
+ gen_bitswap(type, dst, dst, 0x0f0f0f0f0f0f0f0full);
+ }
+}
+
static void gen_rotl(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
if (tcg_op_supported(INDEX_op_rotl, type, 0)) {
@@ -1510,20 +1523,6 @@ void tcg_gen_hswap_i32(TCGv_i32 ret, TCGv_i32 arg)
tcg_gen_rotli_i32(ret, arg, 16);
}
-void tcg_gen_revbit8_i32(TCGv_i32 ret, TCGv_i32 arg)
-{
- if (tcg_op_supported(INDEX_op_revbit8, TCG_TYPE_I32, 0)) {
- tcg_gen_op2_i32(INDEX_op_revbit8, ret, arg);
- } else if (tcg_op_supported(INDEX_op_revbit32, TCG_TYPE_I32, 0)) {
- tcg_gen_op2_i32(INDEX_op_revbit32, ret, arg);
- tcg_gen_bswap32_i32(ret, ret);
- } else {
- gen_bitswap_i32(ret, arg, 0x55555555u);
- gen_bitswap_i32(ret, ret, 0x33333333u);
- gen_bitswap_i32(ret, ret, 0x0f0f0f0fu);
- }
-}
-
void tcg_gen_revbit32_i32(TCGv_i32 ret, TCGv_i32 arg)
{
if (tcg_op_supported(INDEX_op_revbit32, TCG_TYPE_I32, 0)) {
@@ -1744,20 +1743,6 @@ void tcg_gen_revbit32_i64(TCGv_i64 ret, TCGv_i64 arg,
unsigned flags)
}
}
-void tcg_gen_revbit8_i64(TCGv_i64 ret, TCGv_i64 arg)
-{
- if (tcg_op_supported(INDEX_op_revbit8, TCG_TYPE_I64, 0)) {
- tcg_gen_op2_i64(INDEX_op_revbit8, ret, arg);
- } else if (tcg_op_supported(INDEX_op_revbit64, TCG_TYPE_I64, 0)) {
- tcg_gen_op2_i64(INDEX_op_revbit64, ret, arg);
- tcg_gen_bswap64_i64(ret, ret);
- } else {
- gen_bitswap_i64(ret, arg, 0x5555555555555555ull);
- gen_bitswap_i64(ret, ret, 0x3333333333333333ull);
- gen_bitswap_i64(ret, ret, 0x0f0f0f0f0f0f0f0full);
- }
-}
-
void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
{
if (tcg_op_supported(INDEX_op_revbit64, TCG_TYPE_I64, 0)) {
--
2.53.0
