2006-02-24 David S. Miller <davem@sunset.davemloft.net>

	* gas/sparc/rdhpr.s: New test.
	* gas/sparc/rdhpr.d: New test.
	* gas/sparc/wrhpr.s: New test.
	* gas/sparc/wrhpr.d: New test.
	* gas/sparc/window.s: New test.
	* gas/sparc/window.d: New test.
	* gas/sparc/rdpr.s: Add case for reading %gl register.
	* gas/sparc/rdpr.d: Likewise.
	* gas/sparc/wrpr.s: Add case for writing %gl register.
	* gas/sparc/wrpr.d: Likewise.
	* gas/sparc/sparc.exp: Update for new tests.

12 files changed, 90 insertions, 2 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 5dde8f7c06..c167a2192f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2006-02-24  David S. Miller  <davem@sunset.davemloft.net>
+
+	* gas/sparc/rdhpr.s: New test.
+	* gas/sparc/rdhpr.d: New test.
+	* gas/sparc/wrhpr.s: New test.
+	* gas/sparc/wrhpr.d: New test.
+	* gas/sparc/window.s: New test.
+	* gas/sparc/window.d: New test.
+	* gas/sparc/rdpr.s: Add case for reading %gl register.
+	* gas/sparc/rdpr.d: Likewise.
+	* gas/sparc/wrpr.s: Add case for writing %gl register.
+	* gas/sparc/wrpr.d: Likewise.
+	* gas/sparc/sparc.exp: Update for new tests.
+	
 2006-02-24  Paul Brook  <paul@codesourcery.com>
 
 	* gas/arm/thumb32.d: Fix expected msr and mrs output.
diff --git a/gas/testsuite/gas/sparc/rdhpr.d b/gas/testsuite/gas/sparc/rdhpr.d
new file mode 100644
index 0000000000..fbbd76dab8
--- /dev/null
+++ b/gas/testsuite/gas/sparc/rdhpr.d
@@ -0,0 +1,15 @@
+#as: -64 -Av9
+#objdump: -dr
+#name: sparc64 rdhpr
+
+.*: +file format .*sparc.*
+
+Disassembly of section .text:
+
+0+ <.text>:
+   0:	83 48 00 00 	rdhpr  %hpstate, %g1
+   4:	85 48 40 00 	rdhpr  %htstate, %g2
+   8:	87 48 c0 00 	rdhpr  %hintp, %g3
+   c:	89 49 40 00 	rdhpr  %htba, %g4
+  10:	8b 49 80 00 	rdhpr  %hver, %g5
+  14:	8d 4f c0 00 	rdhpr  %hstick_cmpr, %g6
diff --git a/gas/testsuite/gas/sparc/rdhpr.s b/gas/testsuite/gas/sparc/rdhpr.s
new file mode 100644
index 0000000000..5e22f07f35
--- /dev/null
+++ b/gas/testsuite/gas/sparc/rdhpr.s
@@ -0,0 +1,8 @@
+# Test rdpr
+	.text
+	rdhpr %hpstate,%g1
+	rdhpr %htstate,%g2
+	rdhpr %hintp,%g3
+	rdhpr %htba,%g4
+	rdhpr %hver,%g5
+	rdhpr %hstick_cmpr,%g6
diff --git a/gas/testsuite/gas/sparc/rdpr.d b/gas/testsuite/gas/sparc/rdpr.d
index e36ea9b5f4..6ddc24a446 100644
--- a/gas/testsuite/gas/sparc/rdpr.d
+++ b/gas/testsuite/gas/sparc/rdpr.d
@@ -23,4 +23,5 @@ Disassembly of section .text:
   34:	9d 53 40 00 	rdpr  %otherwin, %sp
   38:	9f 53 80 00 	rdpr  %wstate, %o7
   3c:	a1 53 c0 00 	rdpr  %fq, %l0
-  40:	a3 57 c0 00 	rdpr  %ver, %l1
+  40:	a3 54 00 00 	rdpr  %gl, %l1
+  44:	a5 57 c0 00 	rdpr  %ver, %l2
diff --git a/gas/testsuite/gas/sparc/rdpr.s b/gas/testsuite/gas/sparc/rdpr.s
index f44619cea4..15660359c7 100644
--- a/gas/testsuite/gas/sparc/rdpr.s
+++ b/gas/testsuite/gas/sparc/rdpr.s
@@ -16,4 +16,5 @@
 	rdpr %otherwin,%o6
 	rdpr %wstate,%o7
 	rdpr %fq,%l0
-	rdpr %ver,%l1
+	rdpr %gl,%l1
+	rdpr %ver,%l2
diff --git a/gas/testsuite/gas/sparc/sparc.exp b/gas/testsuite/gas/sparc/sparc.exp
index 47ee99e89c..4189ddbff7 100644
--- a/gas/testsuite/gas/sparc/sparc.exp
+++ b/gas/testsuite/gas/sparc/sparc.exp
@@ -40,7 +40,10 @@ if [istarget sparc*-*-*] {
 	run_dump_test "set64"
 	run_dump_test "synth64"
 	run_dump_test "rdpr"
+	run_dump_test "rdhpr"
 	run_dump_test "wrpr"
+	run_dump_test "wrhpr"
+	run_dump_test "window"
 	run_dump_test "reloc64"
 	run_dump_test "pcrel64"
 	run_dump_test "plt64"
diff --git a/gas/testsuite/gas/sparc/window.d b/gas/testsuite/gas/sparc/window.d
new file mode 100644
index 0000000000..31d3daeabc
--- /dev/null
+++ b/gas/testsuite/gas/sparc/window.d
@@ -0,0 +1,15 @@
+#as: -64 -Av9
+#objdump: -dr
+#name: sparc64 window
+
+.*: +file format .*sparc.*
+
+Disassembly of section .text:
+
+0+ <.text>:
+   0:	81 88 00 00 	saved 
+   4:	83 88 00 00 	restored 
+   8:	85 88 00 00 	allclean 
+   c:	87 88 00 00 	otherw 
+  10:	89 88 00 00 	normalw 
+  14:	8b 88 00 00 	invalw 
diff --git a/gas/testsuite/gas/sparc/window.s b/gas/testsuite/gas/sparc/window.s
new file mode 100644
index 0000000000..38c0410db9
--- /dev/null
+++ b/gas/testsuite/gas/sparc/window.s
@@ -0,0 +1,8 @@
+# Test window
+	.text
+	saved
+	restored
+	allclean
+	otherw
+	normalw
+	invalw
diff --git a/gas/testsuite/gas/sparc/wrhpr.d b/gas/testsuite/gas/sparc/wrhpr.d
new file mode 100644
index 0000000000..a9ec2b6bcd
--- /dev/null
+++ b/gas/testsuite/gas/sparc/wrhpr.d
@@ -0,0 +1,14 @@
+#as: -64 -Av9
+#objdump: -dr
+#name: sparc64 wrhpr
+
+.*: +file format .*sparc.*
+
+Disassembly of section .text:
+
+0+ <.text>:
+   0:	81 98 40 00 	wrhpr  %g1, %hpstate
+   4:	83 98 80 00 	wrhpr  %g2, %htstate
+   8:	87 98 c0 00 	wrhpr  %g3, %hintp
+   c:	8b 99 00 00 	wrhpr  %g4, %htba
+  10:	bf 99 40 00 	wrhpr  %g5, %hstick_cmpr
diff --git a/gas/testsuite/gas/sparc/wrhpr.s b/gas/testsuite/gas/sparc/wrhpr.s
new file mode 100644
index 0000000000..838bb538ed
--- /dev/null
+++ b/gas/testsuite/gas/sparc/wrhpr.s
@@ -0,0 +1,7 @@
+# Test wrpr
+	.text
+	wrhpr %g1,%hpstate
+	wrhpr %g2,%htstate
+	wrhpr %g3,%hintp
+	wrhpr %g4,%htba
+	wrhpr %g5,%hstick_cmpr
diff --git a/gas/testsuite/gas/sparc/wrpr.d b/gas/testsuite/gas/sparc/wrpr.d
index 1d3c80e1c5..d0c1b35a98 100644
--- a/gas/testsuite/gas/sparc/wrpr.d
+++ b/gas/testsuite/gas/sparc/wrpr.d
@@ -22,3 +22,4 @@ Disassembly of section .text:
   30:	99 93 40 00 	wrpr  %o5, %cleanwin
   34:	9b 93 80 00 	wrpr  %sp, %otherwin
   38:	9d 93 c0 00 	wrpr  %o7, %wstate
+  3c:	a1 94 00 00 	wrpr  %l0, %gl
diff --git a/gas/testsuite/gas/sparc/wrpr.s b/gas/testsuite/gas/sparc/wrpr.s
index 67fd4504f4..e32b149c9b 100644
--- a/gas/testsuite/gas/sparc/wrpr.s
+++ b/gas/testsuite/gas/sparc/wrpr.s
@@ -15,3 +15,4 @@
 	wrpr %o5,%cleanwin
 	wrpr %o6,%otherwin
 	wrpr %o7,%wstate
+	wrpr %l0,%gl