target-ppc: Use ctpop helper
Signed-off-by: Richard Henderson <rth@twiddle.net>
This commit is contained in:
parent
de26a584d2
commit
7977000220
|
@ -39,12 +39,11 @@ DEF_HELPER_4(divweu, tl, env, tl, tl, i32)
|
||||||
DEF_HELPER_4(divwe, tl, env, tl, tl, i32)
|
DEF_HELPER_4(divwe, tl, env, tl, tl, i32)
|
||||||
|
|
||||||
DEF_HELPER_FLAGS_1(popcntb, TCG_CALL_NO_RWG_SE, tl, tl)
|
DEF_HELPER_FLAGS_1(popcntb, TCG_CALL_NO_RWG_SE, tl, tl)
|
||||||
DEF_HELPER_FLAGS_1(popcntw, TCG_CALL_NO_RWG_SE, tl, tl)
|
|
||||||
DEF_HELPER_FLAGS_2(cmpb, TCG_CALL_NO_RWG_SE, tl, tl, tl)
|
DEF_HELPER_FLAGS_2(cmpb, TCG_CALL_NO_RWG_SE, tl, tl, tl)
|
||||||
DEF_HELPER_3(sraw, tl, env, tl, tl)
|
DEF_HELPER_3(sraw, tl, env, tl, tl)
|
||||||
#if defined(TARGET_PPC64)
|
#if defined(TARGET_PPC64)
|
||||||
DEF_HELPER_FLAGS_2(cmpeqb, TCG_CALL_NO_RWG_SE, i32, tl, tl)
|
DEF_HELPER_FLAGS_2(cmpeqb, TCG_CALL_NO_RWG_SE, i32, tl, tl)
|
||||||
DEF_HELPER_FLAGS_1(popcntd, TCG_CALL_NO_RWG_SE, tl, tl)
|
DEF_HELPER_FLAGS_1(popcntw, TCG_CALL_NO_RWG_SE, tl, tl)
|
||||||
DEF_HELPER_FLAGS_2(bpermd, TCG_CALL_NO_RWG_SE, i64, i64, i64)
|
DEF_HELPER_FLAGS_2(bpermd, TCG_CALL_NO_RWG_SE, i64, i64, i64)
|
||||||
DEF_HELPER_3(srad, tl, env, tl, tl)
|
DEF_HELPER_3(srad, tl, env, tl, tl)
|
||||||
DEF_HELPER_0(darn32, tl)
|
DEF_HELPER_0(darn32, tl)
|
||||||
|
|
|
@ -272,6 +272,7 @@ target_ulong helper_srad(CPUPPCState *env, target_ulong value,
|
||||||
#if defined(TARGET_PPC64)
|
#if defined(TARGET_PPC64)
|
||||||
target_ulong helper_popcntb(target_ulong val)
|
target_ulong helper_popcntb(target_ulong val)
|
||||||
{
|
{
|
||||||
|
/* Note that we don't fold past bytes */
|
||||||
val = (val & 0x5555555555555555ULL) + ((val >> 1) &
|
val = (val & 0x5555555555555555ULL) + ((val >> 1) &
|
||||||
0x5555555555555555ULL);
|
0x5555555555555555ULL);
|
||||||
val = (val & 0x3333333333333333ULL) + ((val >> 2) &
|
val = (val & 0x3333333333333333ULL) + ((val >> 2) &
|
||||||
|
@ -283,6 +284,7 @@ target_ulong helper_popcntb(target_ulong val)
|
||||||
|
|
||||||
target_ulong helper_popcntw(target_ulong val)
|
target_ulong helper_popcntw(target_ulong val)
|
||||||
{
|
{
|
||||||
|
/* Note that we don't fold past words. */
|
||||||
val = (val & 0x5555555555555555ULL) + ((val >> 1) &
|
val = (val & 0x5555555555555555ULL) + ((val >> 1) &
|
||||||
0x5555555555555555ULL);
|
0x5555555555555555ULL);
|
||||||
val = (val & 0x3333333333333333ULL) + ((val >> 2) &
|
val = (val & 0x3333333333333333ULL) + ((val >> 2) &
|
||||||
|
@ -295,29 +297,15 @@ target_ulong helper_popcntw(target_ulong val)
|
||||||
0x0000ffff0000ffffULL);
|
0x0000ffff0000ffffULL);
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
target_ulong helper_popcntd(target_ulong val)
|
|
||||||
{
|
|
||||||
return ctpop64(val);
|
|
||||||
}
|
|
||||||
#else
|
#else
|
||||||
target_ulong helper_popcntb(target_ulong val)
|
target_ulong helper_popcntb(target_ulong val)
|
||||||
{
|
{
|
||||||
|
/* Note that we don't fold past bytes */
|
||||||
val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
|
val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
|
||||||
val = (val & 0x33333333) + ((val >> 2) & 0x33333333);
|
val = (val & 0x33333333) + ((val >> 2) & 0x33333333);
|
||||||
val = (val & 0x0f0f0f0f) + ((val >> 4) & 0x0f0f0f0f);
|
val = (val & 0x0f0f0f0f) + ((val >> 4) & 0x0f0f0f0f);
|
||||||
return val;
|
return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
target_ulong helper_popcntw(target_ulong val)
|
|
||||||
{
|
|
||||||
val = (val & 0x55555555) + ((val >> 1) & 0x55555555);
|
|
||||||
val = (val & 0x33333333) + ((val >> 2) & 0x33333333);
|
|
||||||
val = (val & 0x0f0f0f0f) + ((val >> 4) & 0x0f0f0f0f);
|
|
||||||
val = (val & 0x00ff00ff) + ((val >> 8) & 0x00ff00ff);
|
|
||||||
val = (val & 0x0000ffff) + ((val >> 16) & 0x0000ffff);
|
|
||||||
return val;
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -1844,14 +1844,18 @@ static void gen_popcntb(DisasContext *ctx)
|
||||||
|
|
||||||
static void gen_popcntw(DisasContext *ctx)
|
static void gen_popcntw(DisasContext *ctx)
|
||||||
{
|
{
|
||||||
|
#if defined(TARGET_PPC64)
|
||||||
gen_helper_popcntw(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]);
|
gen_helper_popcntw(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]);
|
||||||
|
#else
|
||||||
|
tcg_gen_ctpop_i32(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(TARGET_PPC64)
|
#if defined(TARGET_PPC64)
|
||||||
/* popcntd: PowerPC 2.06 specification */
|
/* popcntd: PowerPC 2.06 specification */
|
||||||
static void gen_popcntd(DisasContext *ctx)
|
static void gen_popcntd(DisasContext *ctx)
|
||||||
{
|
{
|
||||||
gen_helper_popcntd(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]);
|
tcg_gen_ctpop_i64(cpu_gpr[rA(ctx->opcode)], cpu_gpr[rS(ctx->opcode)]);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue