tcg/optimize: Use fold_masks_z in fold_extract

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>
This commit is contained in:
Richard Henderson 2024-12-08 20:05:11 -06:00
parent ef6be624f6
commit b6cd00f1ef

View File

@ -1739,25 +1739,22 @@ static bool fold_eqv(OptContext *ctx, TCGOp *op)
static bool fold_extract(OptContext *ctx, TCGOp *op) static bool fold_extract(OptContext *ctx, TCGOp *op)
{ {
uint64_t z_mask_old, z_mask; uint64_t z_mask_old, z_mask;
TempOptInfo *t1 = arg_info(op->args[1]);
int pos = op->args[2]; int pos = op->args[2];
int len = op->args[3]; int len = op->args[3];
if (arg_is_const(op->args[1])) { if (ti_is_const(t1)) {
uint64_t t; return tcg_opt_gen_movi(ctx, op, op->args[0],
extract64(ti_const_val(t1), pos, len));
t = arg_info(op->args[1])->val;
t = extract64(t, pos, len);
return tcg_opt_gen_movi(ctx, op, op->args[0], t);
} }
z_mask_old = arg_info(op->args[1])->z_mask; z_mask_old = t1->z_mask;
z_mask = extract64(z_mask_old, pos, len); z_mask = extract64(z_mask_old, pos, len);
if (pos == 0 && fold_affected_mask(ctx, op, z_mask_old ^ z_mask)) { if (pos == 0 && fold_affected_mask(ctx, op, z_mask_old ^ z_mask)) {
return true; 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) static bool fold_extract2(OptContext *ctx, TCGOp *op)