From 02b1ab82d7f90e3520140a048836d60baacbe7a8 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 29 Jun 2011 20:35:05 +0000 Subject: [PATCH] gas/ * 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. --- gas/ChangeLog | 4 ++++ gas/config/tc-mips.c | 1 + gas/testsuite/ChangeLog | 10 ++++++++++ gas/testsuite/gas/mips/24k-triple-stores-10.d | 5 +++-- gas/testsuite/gas/mips/24k-triple-stores-11.d | 5 +++-- gas/testsuite/gas/mips/24k-triple-stores-9.d | 5 +++-- gas/testsuite/gas/mips/lifloat.d | 4 +++- gas/testsuite/gas/mips/trunc.d | 4 +++- gas/testsuite/gas/mips/vr4111.d | 8 ++++++-- 9 files changed, 36 insertions(+), 10 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index cea235dbbd0..c450f454cf7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2011-06-29 Richard Sandiford + + * config/tc-mips.c (md_mips_end): Call mips_emit_delays. + 2011-06-29 Dave Martin PR gas/12931 diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index ff71a3847ff..5f1470be7b9 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2111,6 +2111,7 @@ md_begin (void) void md_mips_end (void) { + mips_emit_delays (); if (! ECOFF_DEBUGGING) md_obj_end (); } diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 69f11a663cd..e22630c5904 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2011-06-29 Richard Sandiford + + * 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 * gas/mips/24k-branch-delay-1.d: Do not allow stores to be put diff --git a/gas/testsuite/gas/mips/24k-triple-stores-10.d b/gas/testsuite/gas/mips/24k-triple-stores-10.d index c93a06df35d..fd0024c814a 100644 --- a/gas/testsuite/gas/mips/24k-triple-stores-10.d +++ b/gas/testsuite/gas/mips/24k-triple-stores-10.d @@ -1,4 +1,4 @@ -#objdump: -dr +#objdump: -dr -z #as: -mfix-24k -32 #name: 24K: Triple Store (Intervening data #2) @@ -10,4 +10,5 @@ Disassembly of section .text: 4: a1030008 sb v1,8\(t0\) 8: 00000000 nop c: a1040010 sb a0,16\(t0\) - \.\.\. + 10: 00000000 nop +#pass diff --git a/gas/testsuite/gas/mips/24k-triple-stores-11.d b/gas/testsuite/gas/mips/24k-triple-stores-11.d index 66c4a9d0445..f92913afe12 100644 --- a/gas/testsuite/gas/mips/24k-triple-stores-11.d +++ b/gas/testsuite/gas/mips/24k-triple-stores-11.d @@ -1,4 +1,4 @@ -#objdump: -d +#objdump: -dz #as: -mfix-24k -32 #name: 24K: Triple Store (gprel relocs) @@ -14,4 +14,5 @@ Disassembly of section .text: 14: af830000 sw v1,0\(gp\) 18: 00000000 nop 1c: af840000 sw a0,0\(gp\) - + 20: 00000000 nop +#pass diff --git a/gas/testsuite/gas/mips/24k-triple-stores-9.d b/gas/testsuite/gas/mips/24k-triple-stores-9.d index f6ffc674b4a..1a500c0b9d2 100644 --- a/gas/testsuite/gas/mips/24k-triple-stores-9.d +++ b/gas/testsuite/gas/mips/24k-triple-stores-9.d @@ -1,4 +1,4 @@ -#objdump: -dr +#objdump: -drz #as: -mfix-24k -32 #name: 24K: Triple store (Intervening data #1) @@ -12,4 +12,5 @@ Disassembly of section .text: 8: a1030008 sb v1,8\(t0\) c: 00000000 nop 10: a1040010 sb a0,16\(t0\) - \.\.\. + 14: 00000000 nop +#pass diff --git a/gas/testsuite/gas/mips/lifloat.d b/gas/testsuite/gas/mips/lifloat.d index 3f0c1617a1a..bd389bf3b8c 100644 --- a/gas/testsuite/gas/mips/lifloat.d +++ b/gas/testsuite/gas/mips/lifloat.d @@ -1,4 +1,4 @@ -#objdump: -dr --prefix-addresses -mmips:3000 +#objdump: -drz --prefix-addresses -mmips:3000 #name: MIPS lifloat #as: -32 -mips1 @@ -21,3 +21,5 @@ Disassembly of section .text: 0+0018 <[^>]*> ori a0,a0,0xcd36 0+001c <[^>]*> lwc1 \$f4,[-0-9]+\(gp\) [ ]*1c: [A-Z0-9_]*LITERAL[A-Z0-9_]* .lit4.* +0+0020 <[^>]*> nop +#pass diff --git a/gas/testsuite/gas/mips/trunc.d b/gas/testsuite/gas/mips/trunc.d index 64cc9418d95..d71458538f9 100644 --- a/gas/testsuite/gas/mips/trunc.d +++ b/gas/testsuite/gas/mips/trunc.d @@ -1,4 +1,4 @@ -#objdump: -dr --prefix-addresses -mmips:3000 +#objdump: -drz --prefix-addresses -mmips:3000 #name: MIPS trunc #as: -32 -mips1 -mtune=r3000 @@ -27,3 +27,5 @@ Disassembly of section .text: 0+0044 <[^>]*> cvt.w.s \$f4,\$f6 0+0048 <[^>]*> ctc1 a0,\$31 0+004c <[^>]*> nop +0+0050 <[^>]*> nop +#pass diff --git a/gas/testsuite/gas/mips/vr4111.d b/gas/testsuite/gas/mips/vr4111.d index 6c8d4457721..cef9eb2a9ff 100644 --- a/gas/testsuite/gas/mips/vr4111.d +++ b/gas/testsuite/gas/mips/vr4111.d @@ -1,4 +1,4 @@ -#objdump: -dr +#objdump: -drz #name: MIPS VR4111 #as: -march=vr4111 @@ -7,5 +7,9 @@ Disassembly of section \.text: 0+000 <\.text>: + 0: 00850029 dmadd16 a0,a1 - \.\.\. + + 4: 00000000 nop + + 8: 00000000 nop + c: 00a60028 madd16 a1,a2 + +10: 00000000 nop + +14: 00000000 nop +#pass -- 2.30.2