diff options
| author | Richard Sandiford <richard.sandiford@linaro.org> | 2011-03-21 21:38:56 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2011-03-21 21:38:56 +0000 |
| commit | 2ef6ce06d335810dd893c2c6935bbfc84e88dda7 (patch) | |
| tree | 0538178eac12adad63a9e0919a608a535b270ab9 /gcc/function.c | |
| parent | 9a96da32eb7370b930a170579725de2f2ee2f4e2 (diff) | |
| download | gcc-2ef6ce06d335810dd893c2c6935bbfc84e88dda7.zip gcc-2ef6ce06d335810dd893c2c6935bbfc84e88dda7.tar.gz gcc-2ef6ce06d335810dd893c2c6935bbfc84e88dda7.tar.bz2 | |
expr.h (prepare_operand): Move to...
gcc/
2011-03-21 Richard Sandiford <richard.sandiford@linaro.org>
* expr.h (prepare_operand): Move to...
* optabs.h (prepare_operand): ...here and change the insn code
parameter from "int" to "enum insn_code".
(insn_operand_matches): Declare.
* expr.c (init_expr_target): Use insn_operand_matches.
(compress_float_constant): Likewise.
* function.c (safe_insn_predicate, assign_parm_setup_reg): Likewise.
* optabs.c (can_compare_p, prepare_cmp_insn): Likewise.
(emit_cmp_and_jump_insn_1, gen_add2_insn, gen_add3_insn): Likewise.
(have_add2_insn, gen_sub2_insn, gen_sub3_insn, have_sub2_insn): Likewise.
(gen_cond_trap): Likewise.
(prepare_operand): Likewise. Change icode to an insn_code.
(insn_operand_matches): New function.
* reload.c (find_reloads_address_1): Use insn_operand_matches.
* reload1.c (gen_reload): Likewise.
* targhooks.c (default_secondary_reload): Likewise.
From-SVN: r171270
Diffstat (limited to 'gcc/function.c')
| -rw-r--r-- | gcc/function.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/gcc/function.c b/gcc/function.c index 64950a1..a1ea482 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -1493,16 +1493,7 @@ instantiate_virtual_regs_in_rtx (rtx *loc, void *data) static int safe_insn_predicate (int code, int operand, rtx x) { - const struct insn_operand_data *op_data; - - if (code < 0) - return true; - - op_data = &insn_data[code].operand[operand]; - if (op_data->predicate == NULL) - return true; - - return op_data->predicate (x, op_data->mode); + return code < 0 || insn_operand_matches ((enum insn_code) code, operand, x); } /* A subroutine of instantiate_virtual_regs. Instantiate any virtual @@ -3013,8 +3004,8 @@ assign_parm_setup_reg (struct assign_parm_data_all *all, tree parm, op0 = parmreg; op1 = validated_mem; if (icode != CODE_FOR_nothing - && insn_data[icode].operand[0].predicate (op0, promoted_nominal_mode) - && insn_data[icode].operand[1].predicate (op1, data->passed_mode)) + && insn_operand_matches (icode, 0, op0) + && insn_operand_matches (icode, 1, op1)) { enum rtx_code code = unsignedp ? ZERO_EXTEND : SIGN_EXTEND; rtx insn, insns; |