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 | 45 ++++++++++++++----------------------
3 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 96a8ba3026e..79bb00b4a5d 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -129,7 +129,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_clrsb_i32(TCGv_i32 ret, TCGv_i32 arg);
void tcg_gen_rotl_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
void tcg_gen_rotli_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
void tcg_gen_rotr_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
@@ -185,7 +184,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-void tcg_gen_clrsb_i64(TCGv_i64 ret, TCGv_i64 arg);
void tcg_gen_rotl_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
void tcg_gen_rotli_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
void tcg_gen_rotr_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
diff --git a/include/tcg/tcg-op-def.h.inc b/include/tcg/tcg-op-def.h.inc
index 9968ca9516f..1bdf9876067 100644
--- a/include/tcg/tcg-op-def.h.inc
+++ b/include/tcg/tcg-op-def.h.inc
@@ -7,6 +7,7 @@ DEF3(andi, TCGV, TCGV, TINT)
DEF3(andc, TCGV, TCGV, TCGV)
DEF4(brcond, TCGCond, TCGV, TCGV, TCGLabelPtr)
DEF4(brcondi, TCGCond, TCGV, TINT, TCGLabelPtr)
+DEF2(clrsb, TCGV, TCGV)
DEF3(clz, TCGV, TCGV, TCGV)
DEF3(clzi, TCGV, TCGV, TINT)
DEF2(ctpop, TCGV, TCGV)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index ad738316293..eb3c55ba69b 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -495,6 +495,23 @@ static void gen_brcondi(TCGType type, TCGCond cond,
TCGTemp *src1,
gen_brcond(type, cond, src1, tcg_constant_internal(type, src2), l);
}
+static void gen_clrsb(TCGType type, TCGTemp *dst, TCGTemp *src)
+{
+ if (tcg_op_supported(INDEX_op_clz, TCG_TYPE_REG, 0)) {
+ g_autoptr(TCGTemp) tmp = tcg_temp_new_ebb(type);
+ int width = tcg_type_size(type) * 8;
+
+ gen_sari(type, tmp, src, width - 1);
+ gen_xor(type, tmp, tmp, src);
+ gen_clzi(type, tmp, tmp, width);
+ gen_addi(type, dst, tmp, -1);
+ } else if (type == TCG_TYPE_I32) {
+ gen_helper_clrsb_i32(temp_tcgv_i32(dst), temp_tcgv_i32(src));
+ } else {
+ gen_helper_clrsb_i64(temp_tcgv_i64(dst), temp_tcgv_i64(src));
+ }
+}
+
static void gen_clz(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
if (tcg_op_supported(INDEX_op_clz, type, 0)) {
@@ -922,20 +939,6 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_clrsb_i32(TCGv_i32 ret, TCGv_i32 arg)
-{
- if (tcg_op_supported(INDEX_op_clz, TCG_TYPE_REG, 0)) {
- TCGv_i32 t = tcg_temp_ebb_new_i32();
- tcg_gen_sari_i32(t, arg, 31);
- tcg_gen_xor_i32(t, t, arg);
- tcg_gen_clzi_i32(t, t, 32);
- tcg_gen_subi_i32(ret, t, 1);
- tcg_temp_free_i32(t);
- } else {
- gen_helper_clrsb_i32(ret, arg);
- }
-}
-
void tcg_gen_rotl_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2)
{
if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I32, 0)) {
@@ -1767,20 +1770,6 @@ void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-void tcg_gen_clrsb_i64(TCGv_i64 ret, TCGv_i64 arg)
-{
- if (tcg_op_supported(INDEX_op_clz, TCG_TYPE_I64, 0)) {
- TCGv_i64 t = tcg_temp_ebb_new_i64();
- tcg_gen_sari_i64(t, arg, 63);
- tcg_gen_xor_i64(t, t, arg);
- tcg_gen_clzi_i64(t, t, 64);
- tcg_gen_subi_i64(ret, t, 1);
- tcg_temp_free_i64(t);
- } else {
- gen_helper_clrsb_i64(ret, arg);
- }
-}
-
void tcg_gen_rotl_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2)
{
if (tcg_op_supported(INDEX_op_rotl, TCG_TYPE_I64, 0)) {
--
2.53.0
