diff options
| author | Richard Sandiford <richard.sandiford@arm.com> | 2014-10-22 12:02:26 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2014-10-22 12:02:26 +0000 |
| commit | daca1a96afae35e1a2f39b91f014c2f414f70c5f (patch) | |
| tree | eee5382fbf8bb42300717bebf986a46d87ae8a9f /gcc/reload1.c | |
| parent | 9840b2fa87cc9657dca2b63dc66d37f94d2c9cb8 (diff) | |
| download | gcc-daca1a96afae35e1a2f39b91f014c2f414f70c5f.zip gcc-daca1a96afae35e1a2f39b91f014c2f414f70c5f.tar.gz gcc-daca1a96afae35e1a2f39b91f014c2f414f70c5f.tar.bz2 | |
recog.h (constrain_operands): Add an alternative_mask parameter.
gcc/
* recog.h (constrain_operands): Add an alternative_mask parameter.
(constrain_operands_cached): Likewise.
(get_preferred_alternatives): Declare new form.
* recog.c (get_preferred_alternatives): New bb-taking instance.
(constrain_operands): Take the set of available alternatives as
a parameter.
(check_asm_operands, insn_invalid_p, extract_constrain_insn)
(extract_constrain_insn_cached): Update calls to constrain_operands.
* caller-save.c (reg_save_code): Likewise.
* ira.c (setup_prohibited_mode_move_regs): Likewise.
* postreload-gcse.c (eliminate_partially_redundant_load): Likewise.
* ree.c (combine_reaching_defs): Likewise.
* reload.c (can_reload_into): Likewise.
* reload1.c (reload, reload_as_needed, inc_for_reload): Likewise.
(gen_reload_chain_without_interm_reg_p, emit_input_reload_insns)
(emit_insn_if_valid_for_reload): Likewise.
* reorg.c (fill_slots_from_thread): Likewise.
* config/i386/i386.c (ix86_attr_length_address_default): Likewise.
* config/pa/pa.c (pa_can_combine_p): Likewise.
* config/rl78/rl78.c (insn_ok_now): Likewise.
* config/sh/sh.md (define_peephole2): Likewise.
* final.c (final_scan_insn): Update call to constrain_operands_cached.
From-SVN: r216555
Diffstat (limited to 'gcc/reload1.c')
| -rw-r--r-- | gcc/reload1.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gcc/reload1.c b/gcc/reload1.c index d706e52..74dee44 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -1261,7 +1261,7 @@ reload (rtx_insn *first, int global) if (asm_noperands (PATTERN (insn)) >= 0) { extract_insn (insn); - if (!constrain_operands (1)) + if (!constrain_operands (1, get_enabled_alternatives (insn))) { error_for_asm (insn, "%<asm%> operand has impossible constraints"); @@ -4713,7 +4713,9 @@ reload_as_needed (int live_known) if (p != insn && INSN_P (p) && GET_CODE (PATTERN (p)) != USE && (recog_memoized (p) < 0 - || (extract_insn (p), ! constrain_operands (1)))) + || (extract_insn (p), + !(constrain_operands (1, + get_enabled_alternatives (p)))))) { error_for_asm (insn, "%<asm%> operand requires " @@ -4796,7 +4798,8 @@ reload_as_needed (int live_known) if (n) { extract_insn (p); - n = constrain_operands (1); + n = constrain_operands (1, + get_enabled_alternatives (p)); } /* If the constraints were not met, then @@ -5723,7 +5726,7 @@ gen_reload_chain_without_interm_reg_p (int r1, int r2) /* We want constrain operands to treat this insn strictly in its validity determination, i.e., the way it would after reload has completed. */ - result = constrain_operands (1); + result = constrain_operands (1, get_enabled_alternatives (insn)); } delete_insns_since (last); @@ -7393,7 +7396,7 @@ emit_input_reload_insns (struct insn_chain *chain, struct reload *rl, autoincrement addressing mode, then the resulting insn is ill-formed and we must reject this optimization. */ extract_insn (temp); - if (constrain_operands (1) + if (constrain_operands (1, get_enabled_alternatives (temp)) #ifdef AUTO_INC_DEC && ! find_reg_note (temp, REG_INC, reloadreg) #endif @@ -8580,7 +8583,7 @@ emit_insn_if_valid_for_reload (rtx pat) /* We want constrain operands to treat this insn strictly in its validity determination, i.e., the way it would after reload has completed. */ - if (constrain_operands (1)) + if (constrain_operands (1, get_enabled_alternatives (insn))) return insn; } @@ -9217,7 +9220,7 @@ inc_for_reload (rtx reloadreg, rtx in, rtx value, int inc_amount) if (code >= 0) { extract_insn (add_insn); - if (constrain_operands (1)) + if (constrain_operands (1, get_enabled_alternatives (add_insn))) { /* If this is a pre-increment and we have incremented the value where it lives, copy the incremented value to RELOADREG to |