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 | 42 +++++++++++++++--------------------
3 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index 86922380019..802d7c8352a 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -145,7 +145,6 @@ void tcg_gen_plugin_mem_cb(TCGv_i64 addr, unsigned meminfo);
void tcg_gen_ctz_i32(TCGv_i32 ret, TCGv_i32 arg1, TCGv_i32 arg2);
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_ctpop_i32(TCGv_i32 a1, TCGv_i32 a2);
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);
@@ -204,7 +203,6 @@ void tcg_gen_st_i32(TCGv_i32 arg1, TCGv_ptr arg2,
tcg_target_long offset);
void tcg_gen_ctz_i64(TCGv_i64 ret, TCGv_i64 arg1, TCGv_i64 arg2);
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_ctpop_i64(TCGv_i64 a1, TCGv_i64 a2);
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-def2.h.inc b/include/tcg/tcg-op-def2.h.inc
index 30288a01327..4497f2b6927 100644
--- a/include/tcg/tcg-op-def2.h.inc
+++ b/include/tcg/tcg-op-def2.h.inc
@@ -10,6 +10,7 @@ DEF_CRRRRR(movcond)
DEF_R(discard)
DEF_RI(movi)
DEF_RIR(subfi)
+DEF_RR(ctpop)
DEF_RR(mov)
DEF_RR(neg)
DEF_RR(not)
diff --git a/tcg/tcg-op.c b/tcg/tcg-op.c
index fd8f93f4bde..2be51a5762a 100644
--- a/tcg/tcg-op.c
+++ b/tcg/tcg-op.c
@@ -481,6 +481,24 @@ static void gen_clzi(TCGType type, TCGTemp *dst, TCGTemp
*src1, int64_t src2)
gen_clz(type, dst, src1, tcg_constant_internal(type, src2));
}
+static void gen_ctpop(TCGType type, TCGTemp *dst, TCGTemp *src)
+{
+ if (tcg_op_supported(INDEX_op_ctpop, type, 0)) {
+ gen_op_tt(INDEX_op_ctpop, type, dst, src);
+ } else if (type == TCG_TYPE_I64) {
+ gen_helper_ctpop_i64(temp_tcgv_i64(dst), temp_tcgv_i64(src));
+ } else if (tcg_op_supported(INDEX_op_ctpop, TCG_TYPE_I64, 0)) {
+ TCGTemp *tmp = tcg_temp_new_internal(TCG_TYPE_I64, TEMP_EBB);
+
+ gen_extu_i32_i64(tmp, src);
+ gen_op_tt(INDEX_op_ctpop, TCG_TYPE_I64, tmp, src);
+ gen_extrl_i64_i32(dst, tmp);
+ tcg_temp_free_internal(tmp);
+ } else {
+ gen_helper_ctpop_i32(temp_tcgv_i32(dst), temp_tcgv_i32(src));
+ }
+}
+
static void gen_discard(TCGType type, TCGTemp *src)
{
tcg_gen_op1(INDEX_op_discard, type, temp_arg(src));
@@ -948,21 +966,6 @@ void tcg_gen_clrsb_i32(TCGv_i32 ret, TCGv_i32 arg)
}
}
-void tcg_gen_ctpop_i32(TCGv_i32 ret, TCGv_i32 arg1)
-{
- if (tcg_op_supported(INDEX_op_ctpop, TCG_TYPE_I32, 0)) {
- tcg_gen_op2_i32(INDEX_op_ctpop, ret, arg1);
- } else if (tcg_op_supported(INDEX_op_ctpop, TCG_TYPE_I64, 0)) {
- TCGv_i64 t = tcg_temp_ebb_new_i64();
- tcg_gen_extu_i32_i64(t, arg1);
- tcg_gen_ctpop_i64(t, t);
- tcg_gen_extrl_i64_i32(ret, t);
- tcg_temp_free_i64(t);
- } else {
- gen_helper_ctpop_i32(ret, arg1);
- }
-}
-
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)) {
@@ -1853,15 +1856,6 @@ void tcg_gen_clrsb_i64(TCGv_i64 ret, TCGv_i64 arg)
}
}
-void tcg_gen_ctpop_i64(TCGv_i64 ret, TCGv_i64 arg1)
-{
- if (tcg_op_supported(INDEX_op_ctpop, TCG_TYPE_I64, 0)) {
- tcg_gen_op2_i64(INDEX_op_ctpop, ret, arg1);
- } else {
- gen_helper_ctpop_i64(ret, arg1);
- }
-}
-
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
