Avoid the use of the OptContext slots. Find TempOptInfo once.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/optimize.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 85e6dcdb26..e00d86ab2c 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1906,6 +1906,8 @@ static bool fold_mov(OptContext *ctx, TCGOp *op)
static bool fold_movcond(OptContext *ctx, TCGOp *op)
{
+ uint64_t z_mask, s_mask;
+ TempOptInfo *tt, *ft;
int i;
/* If true and false values are the same, eliminate the cmp. */
@@ -1927,14 +1929,14 @@ static bool fold_movcond(OptContext *ctx, TCGOp *op)
return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[4 - i]);
}
- ctx->z_mask = arg_info(op->args[3])->z_mask
- | arg_info(op->args[4])->z_mask;
- ctx->s_mask = arg_info(op->args[3])->s_mask
- & arg_info(op->args[4])->s_mask;
+ tt = arg_info(op->args[3]);
+ ft = arg_info(op->args[4]);
+ z_mask = tt->z_mask | ft->z_mask;
+ s_mask = tt->s_mask & ft->s_mask;
- if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) {
- uint64_t tv = arg_info(op->args[3])->val;
- uint64_t fv = arg_info(op->args[4])->val;
+ if (tt->is_const && ft->is_const) {
+ uint64_t tv = tt->val;
+ uint64_t fv = ft->val;
TCGOpcode opc, negopc = 0;
TCGCond cond = op->args[5];
@@ -1973,7 +1975,8 @@ static bool fold_movcond(OptContext *ctx, TCGOp *op)
}
}
}
- return false;
+
+ return fold_masks_zs(ctx, op, z_mask, s_mask);
}
static bool fold_mul(OptContext *ctx, TCGOp *op)
--
2.43.0