* config/tc-mips.c (nops_for_vr4130): Don't check noreorder_p.
	(nops_for_insn): Likewise.

gas/testsuite/
	* gas/mips/vr4130.s, gas/mips/vr4130.d: Expect part A to have nops.
This commit is contained in:
Richard Sandiford 2009-05-23 08:28:22 +00:00
parent 10841c82f4
commit 65b02341cc
5 changed files with 32 additions and 9 deletions

View File

@ -1,3 +1,8 @@
2009-05-23 Richard Sandiford <rdsandiford@googlemail.com>
* config/tc-mips.c (nops_for_vr4130): Don't check noreorder_p.
(nops_for_insn): Likewise.
2009-05-22 H.J. Lu <hongjiu.lu@intel.com>
* symbols.c (COPIED_SYMFLAGS): Add BSF_GNU_INDIRECT_FUNCTION.

View File

@ -2679,7 +2679,7 @@ nops_for_vr4130 (const struct mips_cl_insn *history,
/* Search for the first MFLO or MFHI. */
for (i = 0; i < MAX_VR4130_NOPS; i++)
if (!history[i].noreorder_p && MF_HILO_INSN (history[i].insn_mo->pinfo))
if (MF_HILO_INSN (history[i].insn_mo->pinfo))
{
/* Extract the destination register. */
if (mips_opts.mips16)
@ -2714,12 +2714,11 @@ nops_for_insn (const struct mips_cl_insn *history,
nops = 0;
for (i = 0; i < MAX_DELAY_NOPS; i++)
if (!history[i].noreorder_p)
{
tmp_nops = insns_between (history + i, insn) - i;
if (tmp_nops > nops)
nops = tmp_nops;
}
{
tmp_nops = insns_between (history + i, insn) - i;
if (tmp_nops > nops)
nops = tmp_nops;
}
if (mips_fix_vr4130)
{

View File

@ -1,3 +1,7 @@
2009-05-23 Richard Sandiford <rdsandiford@googlemail.com>
* gas/mips/vr4130.s, gas/mips/vr4130.d: Expect part A to have nops.
2009-05-23 Richard Sandiford <rdsandiford@googlemail.com>
* gas/mips/align.d: Use an nm test rather than an objdump one.

View File

@ -11,9 +11,17 @@ Disassembly.*
# PART A
#
.* mfhi .*
.* nop
.* nop
.* nop
.* nop
.* mult .*
#
.* mflo .*
.* nop
.* nop
.* nop
.* nop
.* mult .*
#
# PART B
@ -426,9 +434,17 @@ Disassembly.*
# PART A
#
.* mfhi .*
.* nop
.* nop
.* nop
.* nop
.* mult .*
#
.* mflo .*
.* nop
.* nop
.* nop
.* nop
.* mult .*
#
# PART B

View File

@ -16,8 +16,7 @@
# PART A
#
# Check that mfhis and mflos in .set noreorder blocks are not
# considered.
# Check that mfhis and mflos in .set noreorder blocks are considered.
.set noreorder
mfhi $2