opcodes/

	* micromips-opc.c (micromips_opcodes): Use RD_4 for "alnv.ps",
	replacing NODS.

	gas/testsuite/
	* gas/testsuite/gas/mips/micromips-insn32.d: Adjust for delay
	slot scheduling of ALNV.PS.
	* gas/testsuite/gas/mips/micromips-noinsn32.d: Likewise.
	* gas/testsuite/gas/mips/micromips-trap.d: Likewise.
	* gas/testsuite/gas/mips/micromips.d: Likewise.
	* gas/testsuite/gas/mips/micromips@alnv_ps-swap.d: Likewise.

6 files changed, 17 insertions, 23 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 253b3a5d41..eb39f6b290 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2013-08-23  Maciej W. Rozycki  <macro@codesourcery.com>
+
+	* gas/testsuite/gas/mips/micromips-insn32.d: Adjust for delay
+	slot scheduling of ALNV.PS.
+	* gas/testsuite/gas/mips/micromips-noinsn32.d: Likewise.
+	* gas/testsuite/gas/mips/micromips-trap.d: Likewise.
+	* gas/testsuite/gas/mips/micromips.d: Likewise.
+	* gas/testsuite/gas/mips/micromips@alnv_ps-swap.d: Likewise.
+
 2013-08-23  Yuri Chornoivan  <yurchor@ukr.net>
 
 	PR binutils/15834
diff --git a/gas/testsuite/gas/mips/micromips-insn32.d b/gas/testsuite/gas/mips/micromips-insn32.d
index d7092df5a3..a28c519585 100644
--- a/gas/testsuite/gas/mips/micromips-insn32.d
+++ b/gas/testsuite/gas/mips/micromips-insn32.d
@@ -5106,10 +5106,9 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	5441 0099 	alnv\.ps	\$f0,\$f1,\$f2,v0
 [ 0-9a-f]+:	5441 07d9 	alnv\.ps	\$f0,\$f1,\$f2,ra
 [ 0-9a-f]+:	57fe efd9 	alnv\.ps	\$f29,\$f30,\$f31,ra
-[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
-[ 0-9a-f]+:	0000 0000 	nop
+[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
 [ 0-9a-f]+:	0000 0000 	nop
diff --git a/gas/testsuite/gas/mips/micromips-noinsn32.d b/gas/testsuite/gas/mips/micromips-noinsn32.d
index 341a579bd0..520c9cb3f8 100644
--- a/gas/testsuite/gas/mips/micromips-noinsn32.d
+++ b/gas/testsuite/gas/mips/micromips-noinsn32.d
@@ -5085,10 +5085,9 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	5441 0099 	alnv\.ps	\$f0,\$f1,\$f2,v0
 [ 0-9a-f]+:	5441 07d9 	alnv\.ps	\$f0,\$f1,\$f2,ra
 [ 0-9a-f]+:	57fe efd9 	alnv\.ps	\$f29,\$f30,\$f31,ra
-[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
-[ 0-9a-f]+:	0c00      	nop
+[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
 [ 0-9a-f]+:	0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips-trap.d b/gas/testsuite/gas/mips/micromips-trap.d
index 16f82407b0..f1167a0af9 100644
--- a/gas/testsuite/gas/mips/micromips-trap.d
+++ b/gas/testsuite/gas/mips/micromips-trap.d
@@ -5091,10 +5091,9 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	5441 0099 	alnv\.ps	\$f0,\$f1,\$f2,v0
 [ 0-9a-f]+:	5441 07d9 	alnv\.ps	\$f0,\$f1,\$f2,ra
 [ 0-9a-f]+:	57fe efd9 	alnv\.ps	\$f29,\$f30,\$f31,ra
-[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
-[ 0-9a-f]+:	0c00      	nop
+[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
 [ 0-9a-f]+:	0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips.d b/gas/testsuite/gas/mips/micromips.d
index 9f54ec495b..4821d0997e 100644
--- a/gas/testsuite/gas/mips/micromips.d
+++ b/gas/testsuite/gas/mips/micromips.d
@@ -5163,10 +5163,9 @@ Disassembly of section \.text:
 [ 0-9a-f]+:	5441 0099 	alnv\.ps	\$f0,\$f1,\$f2,v0
 [ 0-9a-f]+:	5441 07d9 	alnv\.ps	\$f0,\$f1,\$f2,ra
 [ 0-9a-f]+:	57fe efd9 	alnv\.ps	\$f29,\$f30,\$f31,ra
-[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
-[ 0-9a-f]+:	0c00      	nop
+[ 0-9a-f]+:	57fd efd9 	alnv\.ps	\$f29,\$f29,\$f31,ra
 [ 0-9a-f]+:	4380 fffe 	bc1f	[0-9a-f]+ <fp_test\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	fp_test
 [ 0-9a-f]+:	0c00      	nop
diff --git a/gas/testsuite/gas/mips/micromips@alnv_ps-swap.d b/gas/testsuite/gas/mips/micromips@alnv_ps-swap.d
index 2fbe526a41..87a2e72131 100644
--- a/gas/testsuite/gas/mips/micromips@alnv_ps-swap.d
+++ b/gas/testsuite/gas/mips/micromips@alnv_ps-swap.d
@@ -6,37 +6,28 @@
 # Check that a register dependency between ALNV.PS and the following
 # branch prevents from branch swapping (microMIPS).
 
-# Note that currently swapping of ALNV.PS in microMIPS code is disabled
-# altogether.
-
 .*: +file format .*mips.*
 
 Disassembly of section \.text:
-[0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
-([0-9a-f]+) <[^>]*> cfff      	b	\1 <foo\+0x[0-9a-f]+>
+([0-9a-f]+) <[^>]*> cfff      	b	\1 <foo>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC10_S1	foo
-[0-9a-f]+ <[^>]*> 0c00      	nop
 [0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
 ([0-9a-f]+) <[^>]*> 4060 fffe 	bal	\1 <foo\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	foo
-[0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
 ([0-9a-f]+) <[^>]*> 4023 fffe 	bltzal	v1,\1 <foo\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	foo
-[0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
 [0-9a-f]+ <[^>]*> 45c3      	jalr	v1
-[0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
 [0-9a-f]+ <[^>]*> 0083 0f3c 	jalr	a0,v1
-[0-9a-f]+ <[^>]*> 0000 0000 	nop
+[0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
 [0-9a-f]+ <[^>]*> 5402 20d9 	alnv\.ps	\$f4,\$f2,\$f0,v1
 [0-9a-f]+ <[^>]*> 007f 0f3c 	jalr	v1,ra
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
-[0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 ([0-9a-f]+) <[^>]*> cfff      	b	\1 <foo\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC10_S1	foo
-[0-9a-f]+ <[^>]*> 0c00      	nop
+[0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 [0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 ([0-9a-f]+) <[^>]*> 4060 fffe 	bal	\1 <foo\+0x[0-9a-f]+>
 [ 	]*[0-9a-f]+: R_MICROMIPS_PC16_S1	foo
@@ -48,10 +39,8 @@ Disassembly of section \.text:
 [0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 [0-9a-f]+ <[^>]*> 45c3      	jalr	v1
 [0-9a-f]+ <[^>]*> 0000 0000 	nop
-[0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 [0-9a-f]+ <[^>]*> 0083 0f3c 	jalr	a0,v1
-[0-9a-f]+ <[^>]*> 0000 0000 	nop
 [0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 [0-9a-f]+ <[^>]*> 007f 0f3c 	jalr	v1,ra
-[0-9a-f]+ <[^>]*> 0000 0000 	nop
+[0-9a-f]+ <[^>]*> 5402 27d9 	alnv\.ps	\$f4,\$f2,\$f0,ra
 	\.\.\.