* config/tc-mips.c (md_mips_end): Call mips_emit_delays.

gas/testsuite/
	* gas/mips/24k-triple-stores-9.d: Add -z to dump options and
	explicitly match one nop.
	* gas/mips/24k-triple-stores-10.d: Likewise.
	* gas/mips/24k-triple-stores-11.d: Likewise.
	* gas/mips/lifloat.d: Likewise.
	* gas/mips/trunc.d: Likewise 1 extra nop.
	* gas/mips/vr4111.d: Likewise 2 nops.
This commit is contained in:
Richard Sandiford 2011-06-29 20:35:05 +00:00
parent 0ecee54cfd
commit 02b1ab82d7
9 changed files with 36 additions and 10 deletions

View file

@ -1,3 +1,7 @@
2011-06-29 Richard Sandiford <rdsandiford@googlemail.com>
* config/tc-mips.c (md_mips_end): Call mips_emit_delays.
2011-06-29 Dave Martin <dave.martin@linaro.org> 2011-06-29 Dave Martin <dave.martin@linaro.org>
PR gas/12931 PR gas/12931

View file

@ -2111,6 +2111,7 @@ md_begin (void)
void void
md_mips_end (void) md_mips_end (void)
{ {
mips_emit_delays ();
if (! ECOFF_DEBUGGING) if (! ECOFF_DEBUGGING)
md_obj_end (); md_obj_end ();
} }

View file

@ -1,3 +1,13 @@
2011-06-29 Richard Sandiford <rdsandiford@googlemail.com>
* gas/mips/24k-triple-stores-9.d: Add -z to dump options and
explicitly match one nop.
* gas/mips/24k-triple-stores-10.d: Likewise.
* gas/mips/24k-triple-stores-11.d: Likewise.
* gas/mips/lifloat.d: Likewise.
* gas/mips/trunc.d: Likewise 1 extra nop.
* gas/mips/vr4111.d: Likewise 2 nops.
2011-06-26 Richard Sandiford <rdsandiford@googlemail.com> 2011-06-26 Richard Sandiford <rdsandiford@googlemail.com>
* gas/mips/24k-branch-delay-1.d: Do not allow stores to be put * gas/mips/24k-branch-delay-1.d: Do not allow stores to be put

View file

@ -1,4 +1,4 @@
#objdump: -dr #objdump: -dr -z
#as: -mfix-24k -32 #as: -mfix-24k -32
#name: 24K: Triple Store (Intervening data #2) #name: 24K: Triple Store (Intervening data #2)
@ -10,4 +10,5 @@ Disassembly of section .text:
4: a1030008 sb v1,8\(t0\) 4: a1030008 sb v1,8\(t0\)
8: 00000000 nop 8: 00000000 nop
c: a1040010 sb a0,16\(t0\) c: a1040010 sb a0,16\(t0\)
\.\.\. 10: 00000000 nop
#pass

View file

@ -1,4 +1,4 @@
#objdump: -d #objdump: -dz
#as: -mfix-24k -32 #as: -mfix-24k -32
#name: 24K: Triple Store (gprel relocs) #name: 24K: Triple Store (gprel relocs)
@ -14,4 +14,5 @@ Disassembly of section .text:
14: af830000 sw v1,0\(gp\) 14: af830000 sw v1,0\(gp\)
18: 00000000 nop 18: 00000000 nop
1c: af840000 sw a0,0\(gp\) 1c: af840000 sw a0,0\(gp\)
20: 00000000 nop
#pass

View file

@ -1,4 +1,4 @@
#objdump: -dr #objdump: -drz
#as: -mfix-24k -32 #as: -mfix-24k -32
#name: 24K: Triple store (Intervening data #1) #name: 24K: Triple store (Intervening data #1)
@ -12,4 +12,5 @@ Disassembly of section .text:
8: a1030008 sb v1,8\(t0\) 8: a1030008 sb v1,8\(t0\)
c: 00000000 nop c: 00000000 nop
10: a1040010 sb a0,16\(t0\) 10: a1040010 sb a0,16\(t0\)
\.\.\. 14: 00000000 nop
#pass

View file

@ -1,4 +1,4 @@
#objdump: -dr --prefix-addresses -mmips:3000 #objdump: -drz --prefix-addresses -mmips:3000
#name: MIPS lifloat #name: MIPS lifloat
#as: -32 -mips1 #as: -32 -mips1
@ -21,3 +21,5 @@ Disassembly of section .text:
0+0018 <[^>]*> ori a0,a0,0xcd36 0+0018 <[^>]*> ori a0,a0,0xcd36
0+001c <[^>]*> lwc1 \$f4,[-0-9]+\(gp\) 0+001c <[^>]*> lwc1 \$f4,[-0-9]+\(gp\)
[ ]*1c: [A-Z0-9_]*LITERAL[A-Z0-9_]* .lit4.* [ ]*1c: [A-Z0-9_]*LITERAL[A-Z0-9_]* .lit4.*
0+0020 <[^>]*> nop
#pass

View file

@ -1,4 +1,4 @@
#objdump: -dr --prefix-addresses -mmips:3000 #objdump: -drz --prefix-addresses -mmips:3000
#name: MIPS trunc #name: MIPS trunc
#as: -32 -mips1 -mtune=r3000 #as: -32 -mips1 -mtune=r3000
@ -27,3 +27,5 @@ Disassembly of section .text:
0+0044 <[^>]*> cvt.w.s \$f4,\$f6 0+0044 <[^>]*> cvt.w.s \$f4,\$f6
0+0048 <[^>]*> ctc1 a0,\$31 0+0048 <[^>]*> ctc1 a0,\$31
0+004c <[^>]*> nop 0+004c <[^>]*> nop
0+0050 <[^>]*> nop
#pass

View file

@ -1,4 +1,4 @@
#objdump: -dr #objdump: -drz
#name: MIPS VR4111 #name: MIPS VR4111
#as: -march=vr4111 #as: -march=vr4111
@ -7,5 +7,9 @@
Disassembly of section \.text: Disassembly of section \.text:
0+000 <\.text>: 0+000 <\.text>:
+ 0: 00850029 dmadd16 a0,a1 + 0: 00850029 dmadd16 a0,a1
\.\.\. + 4: 00000000 nop
+ 8: 00000000 nop
+ c: 00a60028 madd16 a1,a2 + c: 00a60028 madd16 a1,a2
+10: 00000000 nop
+14: 00000000 nop
#pass