From 8dbb9eb3c6a29de5b64fadc558c7a15507d6be63 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@redhat.com>
Date: Thu, 8 Sep 2011 19:03:17 +0000
Subject: [PATCH] opcodes/

	* sparc-opc.c (sparc_opcodes): Add entry for 'save simm13,regrs1,regrd'
	This has been reported as being accepted by the Sun assmebler.

gas/testsuite/

	* gas/sparc/save-args.[sd]: New test.
	* gas/sparc/sparc.exp: Run new test.
---
 gas/testsuite/ChangeLog             |  3 +++
 gas/testsuite/gas/sparc/save-args.d | 12 ++++++++++++
 gas/testsuite/gas/sparc/save-args.s |  6 ++++++
 gas/testsuite/gas/sparc/sparc.exp   |  1 +
 opcodes/ChangeLog                   |  3 +++
 opcodes/sparc-opc.c                 |  1 +
 6 files changed, 26 insertions(+)
 create mode 100644 gas/testsuite/gas/sparc/save-args.d
 create mode 100644 gas/testsuite/gas/sparc/save-args.s

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 90af146f28b..fe34a0bff57 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -7,6 +7,9 @@
 	* gas/sparc/v8-movwr-imm.[sd]: New test.
 	* gas/sparc/sparc.exp: Run new tests.
 
+	* gas/sparc/save-args.[sd]: New test.
+	* gas/sparc/sparc.exp: Run new test.
+
 2011-09-08  David S. Miller  <davem@davemloft.net>
 
 	* gas/sparc/hpcvis3.s: Correct pdistn test.
diff --git a/gas/testsuite/gas/sparc/save-args.d b/gas/testsuite/gas/sparc/save-args.d
new file mode 100644
index 00000000000..ab5b79f09df
--- /dev/null
+++ b/gas/testsuite/gas/sparc/save-args.d
@@ -0,0 +1,12 @@
+#as: -Av8
+#objdump: -dr
+#name: software traps
+
+.*: +file format .*
+
+Disassembly of section .text:
+
+00000000 <foo>:
+   0:	81 e0 00 00 	save 
+   4:	9d e3 bf a0 	save  %sp, -96, %sp
+   8:	9d e3 bf a0 	save  %sp, -96, %sp
diff --git a/gas/testsuite/gas/sparc/save-args.s b/gas/testsuite/gas/sparc/save-args.s
new file mode 100644
index 00000000000..acaa311a3a5
--- /dev/null
+++ b/gas/testsuite/gas/sparc/save-args.s
@@ -0,0 +1,6 @@
+! Test several forms of save argument
+	.text
+foo:
+	save
+	save	%sp, -96, %sp
+	save	-96, %sp, %sp
diff --git a/gas/testsuite/gas/sparc/sparc.exp b/gas/testsuite/gas/sparc/sparc.exp
index f7f8f8f8e6a..faba8e4ebe2 100644
--- a/gas/testsuite/gas/sparc/sparc.exp
+++ b/gas/testsuite/gas/sparc/sparc.exp
@@ -53,6 +53,7 @@ if [istarget sparc*-*-*] {
     run_dump_test "imm-plus-rreg"
     run_dump_test "ticc-imm-reg"
     run_dump_test "v8-movwr-imm"
+    run_dump_test "save-args"
     run_dump_test "v9branch1"
     run_dump_test "v9branch2"
     run_dump_test "v9branch3"
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 85512d72331..42261823534 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -12,6 +12,9 @@
 	* sparc-opc.c (sparc_opcodes): Add wr alias entries to match above
 	mov aliases.
 
+	* sparc-opc.c (sparc_opcodes): Add entry for 'save simm13,regrs1,regrd'
+	This has been reported as being accepted by the Sun assmebler.
+
 2011-09-08  David S. Miller  <davem@davemloft.net>
 
 	* sparc-opc.c (pdistn): Destination is integer not float register.
diff --git a/opcodes/sparc-opc.c b/opcodes/sparc-opc.c
index 267fc8cc771..6a31c93ac11 100644
--- a/opcodes/sparc-opc.c
+++ b/opcodes/sparc-opc.c
@@ -684,6 +684,7 @@ const struct sparc_opcode sparc_opcodes[] = {
 
 { "save",	F3(2, 0x3c, 0), F3(~2, ~0x3c, ~0)|ASI(~0),	"1,2,d", 0, v6 },
 { "save",	F3(2, 0x3c, 1), F3(~2, ~0x3c, ~1),		"1,i,d", 0, v6 },
+{ "save",	F3(2, 0x3c, 1), F3(~2, ~0x3c, ~1),		"i,1,d", 0, v6 }, /* Sun assembler compatibility */
 { "save",	0x81e00000,	~0x81e00000,			"", F_ALIAS, v6 },
 
 { "ret",  F3(2, 0x38, 1)|RS1(0x1f)|SIMM13(8), F3(~2, ~0x38, ~1)|SIMM13(~8),	       "", F_UNBR|F_DELAYED, v6 }, /* jmpl %i7+8,%g0 */
-- 
2.30.2