tcg/optimize: Use fold_masks_zs in fold_movcond
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:
parent
08abe2908f
commit
322027841f
@ -1889,6 +1889,8 @@ static bool fold_mov(OptContext *ctx, TCGOp *op)
|
|||||||
|
|
||||||
static bool fold_movcond(OptContext *ctx, TCGOp *op)
|
static bool fold_movcond(OptContext *ctx, TCGOp *op)
|
||||||
{
|
{
|
||||||
|
uint64_t z_mask, s_mask;
|
||||||
|
TempOptInfo *tt, *ft;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/* If true and false values are the same, eliminate the cmp. */
|
/* If true and false values are the same, eliminate the cmp. */
|
||||||
@ -1910,14 +1912,14 @@ static bool fold_movcond(OptContext *ctx, TCGOp *op)
|
|||||||
return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[4 - i]);
|
return tcg_opt_gen_mov(ctx, op, op->args[0], op->args[4 - i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->z_mask = arg_info(op->args[3])->z_mask
|
tt = arg_info(op->args[3]);
|
||||||
| arg_info(op->args[4])->z_mask;
|
ft = arg_info(op->args[4]);
|
||||||
ctx->s_mask = arg_info(op->args[3])->s_mask
|
z_mask = tt->z_mask | ft->z_mask;
|
||||||
& arg_info(op->args[4])->s_mask;
|
s_mask = tt->s_mask & ft->s_mask;
|
||||||
|
|
||||||
if (arg_is_const(op->args[3]) && arg_is_const(op->args[4])) {
|
if (ti_is_const(tt) && ti_is_const(ft)) {
|
||||||
uint64_t tv = arg_info(op->args[3])->val;
|
uint64_t tv = ti_const_val(tt);
|
||||||
uint64_t fv = arg_info(op->args[4])->val;
|
uint64_t fv = ti_const_val(ft);
|
||||||
TCGOpcode opc, negopc = 0;
|
TCGOpcode opc, negopc = 0;
|
||||||
TCGCond cond = op->args[5];
|
TCGCond cond = op->args[5];
|
||||||
|
|
||||||
@ -1956,7 +1958,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)
|
static bool fold_mul(OptContext *ctx, TCGOp *op)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user