4 files changed, 18 insertions, 4 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5c0b550..18305c6 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-18  Adam Nemet  <anemet@caviumnetworks.com>
+
+	* gas/mips/octeon.s: Add more tests for dmfc2 and dmtc2.
+	* gas/mips/octeon.d: Update.
+	* gas/mips/octeon-ill.l: Update error message.
+
 2009-02-16  Nick Clifton  <nickc@redhat.com>
 
 	* gas/mips/e32-rel2.d: Adjust expected output to remove the 0x4000
diff --git a/gas/testsuite/gas/mips/octeon-ill.l b/gas/testsuite/gas/mips/octeon-ill.l
index b90eaf1..cdd1e5a 100644
--- a/gas/testsuite/gas/mips/octeon-ill.l
+++ b/gas/testsuite/gas/mips/octeon-ill.l
@@ -28,11 +28,11 @@
 .*:41: Error: opcode not supported on this processor.*
 .*:42: Error: opcode not supported on this processor.*
 .*:43: Error: opcode not supported on this processor.*
-.*:45: Error: expression out of range
-.*:46: Error: expression out of range
-.*:47: Error: register value used as expression
+.*:45: Error: illegal operands `dmfc2 \$2,0x10000'
+.*:46: Error: illegal operands `dmtc2 \$2,0x12345'
+.*:47: Error: illegal operands `dmfc2 \$9,\$12'
 .*:48: Error: illegal operands `dmfc2 \$4,\$15,4'
-.*:49: Error: register value used as expression
+.*:49: Error: illegal operands `dmtc2 \$16,\$8'
 .*:50: Error: illegal operands `dmtc2 \$22,\$7,\$4'
 .*:52: Error: Improper size \(32\)
 .*:54: Error: Improper position \(32\)
diff --git a/gas/testsuite/gas/mips/octeon.d b/gas/testsuite/gas/mips/octeon.d
index 5e32ae6..79b4001 100644
--- a/gas/testsuite/gas/mips/octeon.d
+++ b/gas/testsuite/gas/mips/octeon.d
@@ -46,7 +46,11 @@ Disassembly of section .text:
 .*:	41606000 	di
 .*:	41606020 	ei
 .*:	48230084 	dmfc2	\$3,0x84
+.*:	48260800 	dmfc2	\$6,0x800
+.*:	482c0001 	dmfc2	\$12,0x1
 .*:	48a84200 	dmtc2	\$8,0x4200
+.*:	48a72000 	dmtc2	\$7,0x2000
+.*:	48a20004 	dmtc2	\$2,0x4
 .*:	73400008 	mtm0	\$26
 .*:	7260000c 	mtm1	\$19
 .*:	7240000d 	mtm2	\$18
diff --git a/gas/testsuite/gas/mips/octeon.s b/gas/testsuite/gas/mips/octeon.s
index 4772b4c..c73ffd9 100644
--- a/gas/testsuite/gas/mips/octeon.s
+++ b/gas/testsuite/gas/mips/octeon.s
@@ -47,7 +47,11 @@ foo:
         di
         ei
         dmfc2   $3,0x84
+        dmfc2   $6,0x800
+        dmfc2   $12,0x1
         dmtc2   $8,0x4200
+        dmtc2   $7,0x2000
+        dmtc2   $2,0x4
 
         mtm0    $26
         mtm1    $19