tcg/optimize: Use fold_masks_z in fold_ctpop

Add fold_masks_z as a trivial wrapper around fold_masks_zs.
Avoid the use of the OptContext slots.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2024-12-08 19:49:17 -06:00
parent ce1d663ff8
commit 81be07f905

View file

@ -1067,6 +1067,11 @@ static bool fold_masks_zs(OptContext *ctx, TCGOp *op,
return true; return true;
} }
static bool fold_masks_z(OptContext *ctx, TCGOp *op, uint64_t z_mask)
{
return fold_masks_zs(ctx, op, z_mask, 0);
}
static bool fold_masks(OptContext *ctx, TCGOp *op) static bool fold_masks(OptContext *ctx, TCGOp *op)
{ {
return fold_masks_zs(ctx, op, ctx->z_mask, ctx->s_mask); return fold_masks_zs(ctx, op, ctx->z_mask, ctx->s_mask);
@ -1599,21 +1604,23 @@ static bool fold_count_zeros(OptContext *ctx, TCGOp *op)
static bool fold_ctpop(OptContext *ctx, TCGOp *op) static bool fold_ctpop(OptContext *ctx, TCGOp *op)
{ {
uint64_t z_mask;
if (fold_const1(ctx, op)) { if (fold_const1(ctx, op)) {
return true; return true;
} }
switch (ctx->type) { switch (ctx->type) {
case TCG_TYPE_I32: case TCG_TYPE_I32:
ctx->z_mask = 32 | 31; z_mask = 32 | 31;
break; break;
case TCG_TYPE_I64: case TCG_TYPE_I64:
ctx->z_mask = 64 | 63; z_mask = 64 | 63;
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
return false; return fold_masks_z(ctx, op, z_mask);
} }
static bool fold_deposit(OptContext *ctx, TCGOp *op) static bool fold_deposit(OptContext *ctx, TCGOp *op)