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 | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/tcg/optimize.c b/tcg/optimize.c
index 56043a02e0..6f7166414f 100644
--- a/tcg/optimize.c
+++ b/tcg/optimize.c
@@ -1755,25 +1755,22 @@ static bool fold_eqv(OptContext *ctx, TCGOp *op)
static bool fold_extract(OptContext *ctx, TCGOp *op)
{
uint64_t z_mask_old, z_mask;
+ TempOptInfo *t1 = arg_info(op->args[1]);
int pos = op->args[2];
int len = op->args[3];
- if (arg_is_const(op->args[1])) {
- uint64_t t;
-
- t = arg_info(op->args[1])->val;
- t = extract64(t, pos, len);
- return tcg_opt_gen_movi(ctx, op, op->args[0], t);
+ if (t1->is_const) {
+ return tcg_opt_gen_movi(ctx, op, op->args[0],
+ extract64(t1->val, pos, len));
}
- z_mask_old = arg_info(op->args[1])->z_mask;
+ z_mask_old = t1->z_mask;
z_mask = extract64(z_mask_old, pos, len);
if (pos == 0 && fold_affected_mask(ctx, op, z_mask_old ^ z_mask)) {
return true;
}
- ctx->z_mask = z_mask;
- return fold_masks(ctx, op);
+ return fold_masks_z(ctx, op, z_mask);
}
static bool fold_extract2(OptContext *ctx, TCGOp *op)
--
2.43.0