+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
/* 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. */
/* 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
/* 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