Add fold_masks_s 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>
---
tcg/optimize.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 9906f370de..9c1fba00fb 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1058,6 +1058,11 @@ 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_s(OptContext *ctx, TCGOp *op, uint64_t s_mask)
+{
+ return fold_masks_zs(ctx, op, -1, s_mask);
+}
+
static bool fold_masks(OptContext *ctx, TCGOp *op)
{
return fold_masks_zs(ctx, op, ctx->z_mask, ctx->s_mask);
@@ -1701,15 +1706,17 @@ static bool fold_dup2(OptContext *ctx, TCGOp *op)
static bool fold_eqv(OptContext *ctx, TCGOp *op)
{
+ uint64_t s_mask;
+
if (fold_const2_commutative(ctx, op) ||
fold_xi_to_x(ctx, op, -1) ||
fold_xi_to_not(ctx, op, 0)) {
return true;
}
- ctx->s_mask = arg_info(op->args[1])->s_mask
- & arg_info(op->args[2])->s_mask;
- return false;
+ s_mask = arg_info(op->args[1])->s_mask
+ & arg_info(op->args[2])->s_mask;
+ return fold_masks_s(ctx, op, s_mask);
}
static bool fold_extract(OptContext *ctx, TCGOp *op)
--
2.43.0