* gas/ppc/test2elf64.s: Rename to..

	* gas/ppc/power4.s: ..this.  Add mtcr and mfcr testcases.
	* gas/ppc/test2elf64.d: Rename to..
	* gas/ppc/power4.d: ..this.  Update.
	* gas/ppc/ppc.exp: Update.

4 files changed, 61 insertions, 32 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d3ec143..5a878a5 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* gas/ppc/test2elf64.s: Rename to..
+	* gas/ppc/power4.s: ..this.  Add mtcr and mfcr testcases.
+	* gas/ppc/test2elf64.d: Rename to..
+	* gas/ppc/power4.d: ..this.  Update.
+	* gas/ppc/ppc.exp: Update.
+
 2003-07-02  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
 	* gas/mips/set-arch.d: Fix GPR names and show raw insns.
diff --git a/gas/testsuite/gas/ppc/test2elf64.d b/gas/testsuite/gas/ppc/power4.d
index 1a5f386..e42a81b 100644
--- a/gas/testsuite/gas/ppc/test2elf64.d
+++ b/gas/testsuite/gas/ppc/power4.d
@@ -1,6 +1,6 @@
-#objdump: -Drx -Mpower4
+#objdump: -drx -Mpower4
 #as: -mpower4
-#name: PowerPC Test 2, 64 bit elf, power4 instructions
+#name: Power4 instructions
 
 .*: +file format elf64-powerpc
 .*
@@ -10,7 +10,7 @@ start address 0x0+
 
 Sections:
 Idx Name +Size +VMA +LMA +File off +Algn
- +0 \.text +0+68 +0+ +0+ +.*
+ +0 \.text +0+b8 +0+ +0+ +.*
  +CONTENTS, ALLOC, LOAD, RELOC, READONLY, CODE
  +1 \.data +0+10 +0+ +0+ +.*
  +CONTENTS, ALLOC, LOAD, DATA
@@ -79,23 +79,23 @@ Disassembly of section \.text:
  +5c:	f8 c7 80 02 	stq	r6,-32768\(r7\)
  +60:	f8 c7 7f f2 	stq	r6,32752\(r7\)
  +64:	00 00 02 00 	attn
-Disassembly of section \.data:
-
-0+ <dsym0>:
- +0:	00 00 00 00 	\.long 0x0
- +4:	de ad be ef 	stfdu	f21,-16657\(r13\)
-
-0+8 <dsym1>:
- +8:	00 00 00 00 	\.long 0x0
- +c:	ca fe ba be 	lfd	f23,-17730\(r30\)
-
-Disassembly of section \.toc:
-
-0+ <\.toc>:
-	\.\.\.
-			0: R_PPC64_ADDR64	dsym0
-			8: R_PPC64_ADDR64	dsym1
-			10: R_PPC64_ADDR64	usym0
-			18: R_PPC64_ADDR64	usym1
-			20: R_PPC64_ADDR64	esym0
-			28: R_PPC64_ADDR64	esym1
+ +68:	7c 6f f1 20 	mtcr	r3
+ +6c:	7c 6f f1 20 	mtcr	r3
+ +70:	7c 68 11 20 	mtcrf	129,r3
+ +74:	7c 70 11 20 	mtcrf	1,r3
+ +78:	7c 70 21 20 	mtcrf	2,r3
+ +7c:	7c 70 41 20 	mtcrf	4,r3
+ +80:	7c 70 81 20 	mtcrf	8,r3
+ +84:	7c 71 01 20 	mtcrf	16,r3
+ +88:	7c 72 01 20 	mtcrf	32,r3
+ +8c:	7c 74 01 20 	mtcrf	64,r3
+ +90:	7c 78 01 20 	mtcrf	128,r3
+ +94:	7c 60 00 26 	mfcr	r3
+ +98:	7c 70 10 26 	mfcr	r3,1
+ +9c:	7c 70 20 26 	mfcr	r3,2
+ +a0:	7c 70 40 26 	mfcr	r3,4
+ +a4:	7c 70 80 26 	mfcr	r3,8
+ +a8:	7c 71 00 26 	mfcr	r3,16
+ +ac:	7c 72 00 26 	mfcr	r3,32
+ +b0:	7c 74 00 26 	mfcr	r3,64
+ +b4:	7c 78 00 26 	mfcr	r3,128
diff --git a/gas/testsuite/gas/ppc/test2elf64.s b/gas/testsuite/gas/ppc/power4.s
index 3daf4d6..3514e63 100644
--- a/gas/testsuite/gas/ppc/test2elf64.s
+++ b/gas/testsuite/gas/ppc/power4.s
@@ -1,9 +1,7 @@
-
 	.section	".data"
 dsym0:	.llong	0xdeadbeef
 dsym1:
 
-
 	.section	".toc"
 .L_tsym0:
 	.tc	ignored0[TC],dsym0
@@ -18,7 +16,6 @@ dsym1:
 .L_tsym5:
 	.tc	ignored5[TC],esym1
 
-
 	.section	".text"
 	lq	4,dsym0@l(3)
 	lq	4,dsym1@l(3)
@@ -40,13 +37,37 @@ dsym1:
 	lq	6,dsym1@sectoff(3)
 	lq	6,dsym1@sectoff@l(3)
 	lq	6,usym1-dsym0@l(4)
-	stq 6,	0(7)
-	stq 6,	16(7)
-	stq 6,	-16(7)
-	stq 6,	-32768(7)
-	stq 6,	32752(7)
+	stq	6,0(7)
+	stq	6,16(7)
+	stq	6,-16(7)
+	stq	6,-32768(7)
+	stq	6,32752(7)
+
 	attn
 
+	mtcr	3
+	mtcrf	0xff,3
+	mtcrf	0x81,3
+	mtcrf	0x01,3
+	mtcrf	0x02,3
+	mtcrf	0x04,3
+	mtcrf	0x08,3
+	mtcrf	0x10,3
+	mtcrf	0x20,3
+	mtcrf	0x40,3
+	mtcrf	0x80,3
+	mfcr	3
+#	mfcr	3,0xff	#Error, invalid mask
+#	mfcr	3,0x81	#Error, invalid mask
+	mfcr	3,0x01
+	mfcr	3,0x02
+	mfcr	3,0x04
+	mfcr	3,0x08
+	mfcr	3,0x10
+	mfcr	3,0x20
+	mfcr	3,0x40
+	mfcr	3,0x80
+
 	.section	".data"
 usym0:	.llong	0xcafebabe
 usym1:
diff --git a/gas/testsuite/gas/ppc/ppc.exp b/gas/testsuite/gas/ppc/ppc.exp
index 6d3b031..b891a95 100644
--- a/gas/testsuite/gas/ppc/ppc.exp
+++ b/gas/testsuite/gas/ppc/ppc.exp
@@ -10,7 +10,7 @@ if { [istarget powerpc64*-*-*] || [istarget *-*-elf64*]} then {
     run_dump_test "astest64"
     run_dump_test "astest2_64"
     run_dump_test "test1elf64"
-    run_dump_test "test2elf64"
+    run_dump_test "power4"
 } elseif { [istarget powerpc*-*aix*] } then {
     run_dump_test "test1xcoff32"
 } elseif { [istarget powerpc*-*-*bsd*] \