Commit 7539a012 authored by Richard Henderson's avatar Richard Henderson
Browse files

target-arm: Use clz opcode 



Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
parent b79ea941

target/arm/helper-a64.c

+0 −10
Original line number Diff line number Diff line
@@ -54,11 +54,6 @@ int64_t HELPER(sdiv64)(int64_t num, int64_t den) 
    return num / den;

}



uint64_t HELPER(clz64)(uint64_t x)

{

    return clz64(x);

}



uint64_t HELPER(cls64)(uint64_t x)

{

    return clrsb64(x);
@@ -69,11 +64,6 @@ uint32_t HELPER(cls32)(uint32_t x) 
    return clrsb32(x);

}



uint32_t HELPER(clz32)(uint32_t x)

{

    return clz32(x);

}



uint64_t HELPER(rbit64)(uint64_t x)

{

    return revbit64(x);

target/arm/helper-a64.h

+0 −2
Original line number Diff line number Diff line
@@ -18,10 +18,8 @@ 
 */

DEF_HELPER_FLAGS_2(udiv64, TCG_CALL_NO_RWG_SE, i64, i64, i64)

DEF_HELPER_FLAGS_2(sdiv64, TCG_CALL_NO_RWG_SE, s64, s64, s64)

DEF_HELPER_FLAGS_1(clz64, TCG_CALL_NO_RWG_SE, i64, i64)

DEF_HELPER_FLAGS_1(cls64, TCG_CALL_NO_RWG_SE, i64, i64)

DEF_HELPER_FLAGS_1(cls32, TCG_CALL_NO_RWG_SE, i32, i32)

DEF_HELPER_FLAGS_1(clz32, TCG_CALL_NO_RWG_SE, i32, i32)

DEF_HELPER_FLAGS_1(rbit64, TCG_CALL_NO_RWG_SE, i64, i64)

DEF_HELPER_3(vfp_cmps_a64, i64, f32, f32, ptr)

DEF_HELPER_3(vfp_cmpes_a64, i64, f32, f32, ptr)

target/arm/helper.c

+0 −5
Original line number Diff line number Diff line
@@ -5725,11 +5725,6 @@ uint32_t HELPER(uxtb16)(uint32_t x) 
    return res;

}



uint32_t HELPER(clz)(uint32_t x)

{

    return clz32(x);

}



int32_t HELPER(sdiv)(int32_t num, int32_t den)

{

    if (den == 0)

target/arm/helper.h

+0 −1
Original line number Diff line number Diff line 
DEF_HELPER_FLAGS_1(clz, TCG_CALL_NO_RWG_SE, i32, i32)

DEF_HELPER_FLAGS_1(sxtb16, TCG_CALL_NO_RWG_SE, i32, i32)

DEF_HELPER_FLAGS_1(uxtb16, TCG_CALL_NO_RWG_SE, i32, i32)

target/arm/translate-a64.c

+4 −4
Original line number Diff line number Diff line
@@ -3954,11 +3954,11 @@ static void handle_clz(DisasContext *s, unsigned int sf, 
    tcg_rn = cpu_reg(s, rn);



    if (sf) {

        gen_helper_clz64(tcg_rd, tcg_rn);

        tcg_gen_clzi_i64(tcg_rd, tcg_rn, 64);

    } else {

        TCGv_i32 tcg_tmp32 = tcg_temp_new_i32();

        tcg_gen_extrl_i64_i32(tcg_tmp32, tcg_rn);

        gen_helper_clz(tcg_tmp32, tcg_tmp32);

        tcg_gen_clzi_i32(tcg_tmp32, tcg_tmp32, 32);

        tcg_gen_extu_i32_i64(tcg_rd, tcg_tmp32);

        tcg_temp_free_i32(tcg_tmp32);

    }
@@ -7591,7 +7591,7 @@ static void handle_2misc_64(DisasContext *s, int opcode, bool u, 
    switch (opcode) {

    case 0x4: /* CLS, CLZ */

        if (u) {

            gen_helper_clz64(tcg_rd, tcg_rn);

            tcg_gen_clzi_i64(tcg_rd, tcg_rn, 64);

        } else {

            gen_helper_cls64(tcg_rd, tcg_rn);

        }
@@ -10261,7 +10261,7 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn) 
                    goto do_cmop;

                case 0x4: /* CLS */

                    if (u) {

                        gen_helper_clz32(tcg_res, tcg_op);

                        tcg_gen_clzi_i32(tcg_res, tcg_op, 32);

                    } else {

                        gen_helper_cls32(tcg_res, tcg_op);

                    }