diff options
| author | Trevor Saunders <tbsaunde+gcc@tbsaunde.org> | 2015-10-21 21:05:02 +0000 |
|---|---|---|
| committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2015-10-21 21:05:02 +0000 |
| commit | e90bedf52c86a7b4e2e0a1f8a5a1450725cb95b6 (patch) | |
| tree | 7e4247b26f99c762d570b1e1456c1d1e1167819e /gcc/final.c | |
| parent | 0a798c16c13970d020bc5b93c1aceac9ec5dd7a1 (diff) | |
| download | gcc-e90bedf52c86a7b4e2e0a1f8a5a1450725cb95b6.zip gcc-e90bedf52c86a7b4e2e0a1f8a5a1450725cb95b6.tar.gz gcc-e90bedf52c86a7b4e2e0a1f8a5a1450725cb95b6.tar.bz2 | |
unconditionally compile most of the delay slot code
gcc/ChangeLog:
2015-10-21 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* cfgrtl.c (pass_free_cfg::execute): Adjust.
* final.c (dbr_sequence_length): Always define.
(shorten_branches): Adjust.
* genattr-common.c (main): Always define DELAY_SLOTS.
* genattr.c (main): Unconditionally declare functions and define
macros related to delay slots.
* genattrtab.c (write_eligible_delay): Adjust.
(main): Always write out delay slot functions.
* opts.c (default_options_table): Adjust.
* reorg.c (redirect_with_delay_slots_safe_p): Likewise.
(redirect_with_delay_list_safe_p): Likewise.
(fill_simple_delay_slots): Likewise.
(fill_slots_from_thread): Likewise.
(make_return_insns): Likewise.
(dbr_schedule): Likewise.
(rest_of_handle_delay_slots): Likewise.
(pass_delay_slots::gate): Likewise.
* toplev.c (process_options): Likewise.
From-SVN: r229145
Diffstat (limited to 'gcc/final.c')
| -rw-r--r-- | gcc/final.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gcc/final.c b/gcc/final.c index b604c44..18faa63 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -297,7 +297,6 @@ app_disable (void) delayed branch sequence (we don't count the insn needing the delay slot). Zero if not in a delayed branch sequence. */ -#ifdef DELAY_SLOTS int dbr_sequence_length (void) { @@ -306,7 +305,6 @@ dbr_sequence_length (void) else return 0; } -#endif /* The next two pages contain routines used to compute the length of an insn and to shorten branches. */ @@ -1156,11 +1154,11 @@ shorten_branches (rtx_insn *first) { int i; int const_delay_slots; -#ifdef DELAY_SLOTS - const_delay_slots = const_num_delay_slots (body_seq->insn (0)); -#else - const_delay_slots = 0; -#endif + if (DELAY_SLOTS) + const_delay_slots = const_num_delay_slots (body_seq->insn (0)); + else + const_delay_slots = 0; + int (*inner_length_fun) (rtx_insn *) = const_delay_slots ? length_fun : insn_default_length; /* Inside a delay slot sequence, we do not do any branch shortening |