Signed-off-by: Richard Henderson <[email protected]>
---
include/tcg/tcg-op-common.h | 2 --
include/tcg/tcg-op-def2.h.inc | 1 +
tcg/tcg-op.c | 46 +++++++++--------------------------
3 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 2a860d7a6c2..b5271751994 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -142,7 +142,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
/* 32 bit ops */
-void tcg_gen_ctzi_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2);
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);
@@ -199,7 +198,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
/* 64 bit ops */
-void tcg_gen_ctzi_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2);
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);
diff --git a/include/tcg/tcg-op-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index d0b1141dc10..209bb57b968 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -17,6 +17,7 @@ DEF_RR(not)
DEF_RRI(addi)
DEF_RRI(andi)
DEF_RRI(clzi)
+DEF_RRI(ctzi)
DEF_RRI(muli)
DEF_RRI(ori)
DEF_RRI(sari)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index a33def70cad..3a61cfbc3bd 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -502,6 +502,7 @@ static void gen_ctpop(TCGType type, TCGTemp *dst, TCGTemp
*src)
static void gen_ctz(TCGType type, TCGTemp *dst, TCGTemp *src1, TCGTemp *src2)
{
TCGTemp *t1, *t2;
+ int width = tcg_type_size(type) * 8;
if (tcg_op_supported(INDEX_op_ctz, type, 0)) {
gen_op_ttt(INDEX_op_ctz, type, dst, src1, src2);
@@ -511,10 +512,14 @@ static void gen_ctz(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
t1 = tcg_temp_new_internal(type, TEMP_EBB);
gen_addi(type, t1, src1, -1);
gen_andc(type, t1, t1, src1);
+ if (src2->kind == TEMP_CONST && src2->val == width) {
+ /* No fixup required. */
+ gen_ctpop(type, dst, t1);
+ tcg_temp_free_internal(t1);
+ return;
+ }
gen_ctpop(type, t1, t1);
} else if (tcg_op_supported(INDEX_op_clz, type, 0)) {
- int width = tcg_type_size(type) * 8;
-
t1 = tcg_temp_new_internal(type, TEMP_EBB);
gen_neg(type, t1, src1);
gen_and(type, t1, t1, src1);
@@ -547,6 +552,11 @@ static void gen_ctz(TCGType type, TCGTemp *dst, TCGTemp
*src1, TCGTemp *src2)
tcg_temp_free_internal(t1);
}
+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_discard(TCGType type, TCGTemp *src)
{
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
@@ -944,22 +954,6 @@ static void gen_xori(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
/* 32 bit ops */
-void tcg_gen_ctzi_i32(TCGv_i32 ret, TCGv_i32 arg1, int32_t arg2)
-{
- if (arg2 == 32
- && !tcg_op_supported(INDEX_op_ctz, TCG_TYPE_I32, 0)
- && tcg_op_supported(INDEX_op_ctpop, TCG_TYPE_REG, 0)) {
- /* This equivalence has the advantage of not requiring a fixup. */
- TCGv_i32 t = tcg_temp_ebb_new_i32();
- tcg_gen_subi_i32(t, arg1, 1);
- tcg_gen_andc_i32(t, t, arg1);
- tcg_gen_ctpop_i32(ret, t);
- tcg_temp_free_i32(t);
- } else {
- tcg_gen_ctz_i32(ret, arg1, tcg_constant_i32(arg2));
- }
-}
-
void tcg_gen_clrsb_i32(TCGv_i32 ret, TCGv_i32 arg)
{
if (tcg_op_supported(INDEX_op_clz, TCG_TYPE_REG, 0)) {
@@ -1805,22 +1799,6 @@ void tcg_gen_revbit64_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-void tcg_gen_ctzi_i64(TCGv_i64 ret, TCGv_i64 arg1, int64_t arg2)
-{
- if (arg2 == 64
- && !tcg_op_supported(INDEX_op_ctz, TCG_TYPE_I64, 0)
- && tcg_op_supported(INDEX_op_ctpop, TCG_TYPE_I64, 0)) {
- /* This equivalence has the advantage of not requiring a fixup. */
- TCGv_i64 t = tcg_temp_ebb_new_i64();
- tcg_gen_subi_i64(t, arg1, 1);
- tcg_gen_andc_i64(t, t, arg1);
- tcg_gen_ctpop_i64(ret, t);
- tcg_temp_free_i64(t);
- } else {
- tcg_gen_ctz_i64(ret, arg1, tcg_constant_i64(arg2));
- }
-}
-
void tcg_gen_clrsb_i64(TCGv_i64 ret, TCGv_i64 arg)
{
if (tcg_op_supported(INDEX_op_clz, TCG_TYPE_I64, 0)) {
--
2.53.0
