* gas/mips/jal-svr4pic.d: Reformat. Use --show-raw-insn with

	`objdump'.
	* gas/mips/jal-svr4pic.s: Reformat.  Fix up trailing zeroes.

3 files changed, 50 insertions, 45 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 0bc8e87..527634d 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
 
+	* gas/mips/jal-svr4pic.d: Reformat.  Use --show-raw-insn with
+	`objdump'.
+	* gas/mips/jal-svr4pic.s: Reformat.  Fix up trailing zeroes.
+
+2010-07-24  Maciej W. Rozycki  <macro@codesourcery.com>
+
 	* lib/gas-defs.exp (run_dump_test): Handle the "dump" option.
 
 2010-07-23  Naveen.H.S  <naveen.S@kpitcummins.com>
diff --git a/gas/testsuite/gas/mips/jal-svr4pic.d b/gas/testsuite/gas/mips/jal-svr4pic.d
index 3fc206d..027a040 100644
--- a/gas/testsuite/gas/mips/jal-svr4pic.d
+++ b/gas/testsuite/gas/mips/jal-svr4pic.d
@@ -1,4 +1,4 @@
-#objdump: -dr --prefix-addresses -mmips:3000
+#objdump: -dr --prefix-addresses --show-raw-insn -mmips:3000
 #name: MIPS R3000 jal-svr4pic
 #as: -32 -mips1 -KPIC -mtune=r3000
 
@@ -6,45 +6,45 @@
 
 .*: +file format .*mips.*
 
-Disassembly of section .text:
-0+0000 <[^>]*> lui	gp,0x0
+Disassembly of section \.text:
+[0-9a-f]+ <[^>]*> 3c1c0000 	lui	gp,0x0
 [ 	]*0: R_MIPS_HI16	_gp_disp
-0+0004 <[^>]*> addiu	gp,gp,0
+[0-9a-f]+ <[^>]*> 279c0000 	addiu	gp,gp,0
 [ 	]*4: R_MIPS_LO16	_gp_disp
-0+0008 <[^>]*> addu	gp,gp,t9
-0+000c <[^>]*> sw	gp,0\(sp\)
-0+0010 <[^>]*> jalr	t9
-0+0014 <[^>]*> nop
-0+0018 <[^>]*> lw	gp,0\(sp\)
-0+001c <[^>]*> jalr	a0,t9
-0+0020 <[^>]*> nop
-0+0024 <[^>]*> lw	gp,0\(sp\)
-0+0028 <[^>]*> nop
-0+002c <[^>]*> lw	t9,0\(gp\)
+[0-9a-f]+ <[^>]*> 0399e021 	addu	gp,gp,t9
+[0-9a-f]+ <[^>]*> afbc0000 	sw	gp,0\(sp\)
+[0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
+[0-9a-f]+ <[^>]*> 03202009 	jalr	a0,t9
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
 [ 	]*2c: R_MIPS_GOT16	.text
-0+0030 <[^>]*> nop
-0+0034 <[^>]*> addiu	t9,t9,0
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 27390000 	addiu	t9,t9,0
 [ 	]*34: R_MIPS_LO16	.text
-0+0038 <[^>]*> jalr	t9
+[0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
 [ 	]*38: R_MIPS_JALR	text_label
-0+003c <[^>]*> nop
-0+0040 <[^>]*> lw	gp,0\(sp\)
-0+0044 <[^>]*> nop
-0+0048 <[^>]*> lw	t9,0\(gp\)
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
 [ 	]*48: R_MIPS_CALL16	weak_text_label
-0+004c <[^>]*> nop
-0+0050 <[^>]*> jalr	t9
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
 [ 	]*50: R_MIPS_JALR	weak_text_label
-0+0054 <[^>]*> nop
-0+0058 <[^>]*> lw	gp,0\(sp\)
-0+005c <[^>]*> nop
-0+0060 <[^>]*> lw	t9,0\(gp\)
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8f990000 	lw	t9,0\(gp\)
 [ 	]*60: R_MIPS_CALL16	external_text_label
-0+0064 <[^>]*> nop
-0+0068 <[^>]*> jalr	t9
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 0320f809 	jalr	t9
 [ 	]*68: R_MIPS_JALR	external_text_label
-0+006c <[^>]*> nop
-0+0070 <[^>]*> lw	gp,0\(sp\)
-0+0074 <[^>]*> b	0+0000 <text_label>
-0+0078 <[^>]*> nop
-	...
+[0-9a-f]+ <[^>]*> 00000000 	nop
+[0-9a-f]+ <[^>]*> 8fbc0000 	lw	gp,0\(sp\)
+[0-9a-f]+ <[^>]*> 1000ffe2 	b	0+0000 <text_label>
+[0-9a-f]+ <[^>]*> 00000000 	nop
+	\.\.\.
diff --git a/gas/testsuite/gas/mips/jal-svr4pic.s b/gas/testsuite/gas/mips/jal-svr4pic.s
index 5e2df1e..4b4adf1 100644
--- a/gas/testsuite/gas/mips/jal-svr4pic.s
+++ b/gas/testsuite/gas/mips/jal-svr4pic.s
@@ -1,10 +1,10 @@
 # Source file used to test the jal macro with -KPIC code.
-	
-.weak weak_text_label
 
-	.ent text_label
-text_label:	
-	.frame $sp,0,$31
+	.weak	weak_text_label
+
+	.ent	text_label
+text_label:
+	.frame	$sp,0,$31
 	.set	noreorder
 	.cpload	$25
 	.set	reorder
@@ -15,11 +15,10 @@ text_label:
 	jal	weak_text_label
 	jal	external_text_label
 
-# Test j as well	
+# Test j as well.
 	j	text_label
+	.end	text_label
 
-# Round to a 16 byte boundary, for ease in testing multiple targets.
-	nop
-	nop
-
-	.end text_label
+# Force at least 8 (non-delay-slot) zero bytes, to make 'objdump' print ...
+	.align	2
+	.space	8