diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2010-11-21 10:36:54 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2010-11-21 10:36:54 +0000 |
| commit | 5a48683457b74552004a21ed535fd3d0e96b9a5f (patch) | |
| tree | 5c2800096d2e2040ef29ba7c7edd9ca7e6254de2 | |
| parent | 2dc82a83beaa551d7f3617968f1ea276d889f4e4 (diff) | |
| download | gcc-5a48683457b74552004a21ed535fd3d0e96b9a5f.zip gcc-5a48683457b74552004a21ed535fd3d0e96b9a5f.tar.gz gcc-5a48683457b74552004a21ed535fd3d0e96b9a5f.tar.bz2 | |
mips.c (machine_function): Rename load_label_length to load_label_num_insns.
* config/mips/mips.c (machine_function): Rename load_label_length to
load_label_num_insns.
(mips_load_label_length): Rename to...
(mips_load_label_num_insns): ...this. Adjust to first renaming.
(mips_adjust_insn_length): Adjust to second renaming. Fix thinko.
From-SVN: r167001
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/mips/mips.c | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1237288..9ed55ab 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2010-11-21 Eric Botcazou <ebotcazou@adacore.com> + + * config/mips/mips.c (machine_function): Rename load_label_length to + load_label_num_insns. + (mips_load_label_length): Rename to... + (mips_load_label_num_insns): ...this. Adjust to first renaming. + (mips_adjust_insn_length): Adjust to second renaming. Fix thinko. + 2010-11-21 Uros Bizjak <ubizjak@gmail.com> PR target/46533 diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index f381890..ac81ac3 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -346,7 +346,7 @@ struct GTY(()) machine_function { /* How many instructions it takes to load a label into $AT, or 0 if this property hasn't yet been calculated. */ - unsigned int load_label_length; + unsigned int load_label_num_insns; /* True if mips_adjust_insn_length should ignore an instruction's hazard attribute. */ @@ -11275,14 +11275,14 @@ mips_process_load_label (rtx target) /* Return the number of instructions needed to load a label into $AT. */ static unsigned int -mips_load_label_length (void) +mips_load_label_num_insns (void) { - if (cfun->machine->load_label_length == 0) + if (cfun->machine->load_label_num_insns == 0) { mips_process_load_label (pc_rtx); - cfun->machine->load_label_length = mips_multi_num_insns; + cfun->machine->load_label_num_insns = mips_multi_num_insns; } - return cfun->machine->load_label_length; + return cfun->machine->load_label_num_insns; } /* Emit an asm sequence to start a noat block and load the address @@ -11324,7 +11324,7 @@ mips_adjust_insn_length (rtx insn, int length) /* Load the label into $AT and jump to it. Ignore the delay slot of the jump. */ - length += mips_load_label_length () + 4; + length += 4 * mips_load_label_num_insns() + 4; } /* A unconditional jump has an unfilled delay slot if it is not part |