diff options
| author | Richard Sandiford <rdsandiford@googlemail.com> | 2009-05-23 08:28:22 +0000 |
|---|---|---|
| committer | Richard Sandiford <rdsandiford@googlemail.com> | 2009-05-23 08:28:22 +0000 |
| commit | 65b02341cc8e36be5467123913457f3dd0fb6754 (patch) | |
| tree | bc016e6aa1e3a407fbb02fd0e9369ad2db0dbae8 /gas | |
| parent | 10841c82f4e9505c51755595af078d5763b70be8 (diff) | |
| download | gdb-65b02341cc8e36be5467123913457f3dd0fb6754.zip gdb-65b02341cc8e36be5467123913457f3dd0fb6754.tar.gz gdb-65b02341cc8e36be5467123913457f3dd0fb6754.tar.bz2 | |
gas/
* 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.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-mips.c | 13 | ||||
| -rw-r--r-- | gas/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/vr4130.d | 16 | ||||
| -rw-r--r-- | gas/testsuite/gas/mips/vr4130.s | 3 |
5 files changed, 32 insertions, 9 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index ddd05fa..dd07399 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -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. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 9eb1262..6b8b4df 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -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) { diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index c84f716..28434ca 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,5 +1,9 @@ 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. 2009-05-22 H.J. Lu <hongjiu.lu@intel.com> diff --git a/gas/testsuite/gas/mips/vr4130.d b/gas/testsuite/gas/mips/vr4130.d index 4933d4d..9a6a491 100644 --- a/gas/testsuite/gas/mips/vr4130.d +++ b/gas/testsuite/gas/mips/vr4130.d @@ -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 diff --git a/gas/testsuite/gas/mips/vr4130.s b/gas/testsuite/gas/mips/vr4130.s index 1f1dfcf..74a02bf 100644 --- a/gas/testsuite/gas/mips/vr4130.s +++ b/gas/testsuite/gas/mips/vr4130.s @@ -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 |