2013-10-13 Sandra Loosemore <sandra@codesourcery.com>

	opcodes/
	* nios2-opc.c (nios2_builtin_reg): Use "sstatus" rather than "ba"
	as the primary name of r30.

	gas/
	* config/tc-nios2.c (nios2_consume_arg): Make the "ba" warning
	also test/refer to "sstatus".  Reformat the warning message.

	gas/testsuite/
	* gas/nios2/warn_nobreak.l: Update text of warning messages.
	* gas/nios2/registers.s: Use "sstatus" rather than "ba"
	as the primary name of r30.
	* gas/nios2/registers.d: Likewise.

8 files changed, 41 insertions, 22 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index f923c28237..ccc6f04900 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-13  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* config/tc-nios2.c (nios2_consume_arg): Make the "ba" warning
+	also test/refer to "sstatus".  Reformat the warning message.
+
 2013-10-10  Sean Keys <skeys@ipdatasys.com>
 
 	* tc-xgate.c (xgate_find_match): Refactor opcode matching.
diff --git a/gas/config/tc-nios2.c b/gas/config/tc-nios2.c
index 659bbbc8ec..08b7aecec8 100644
--- a/gas/config/tc-nios2.c
+++ b/gas/config/tc-nios2.c
@@ -1951,15 +1951,17 @@ nios2_consume_arg (nios2_insn_infoS *insn, char *argstr, const char *parsestr)
       /* And whether we are using oci registers.  */
       if (!nios2_as_options.nobreak
 	  && (regno == 25 || strprefix (argstr, "bt")))
-	as_warn (_("The debugger will corrupt bt (r25). If you don't need to "
-		   "debug this\n"
-		   "code then use .set nobreak to turn off this warning."));
+	as_warn (_("The debugger will corrupt bt (r25).\n"
+		   "If you don't need to debug this "
+		   "code use .set nobreak to turn off this warning."));
 	
       if (!nios2_as_options.nobreak
-	  && (regno == 30 || strprefix (argstr, "ba")))
-	as_warn (_("The debugger will corrupt ba (r30). If you don't need to "
-		   "debug this\n"
-		   "code then use .set nobreak to turn off this warning."));
+	  && (regno == 30
+	      || strprefix (argstr, "ba")
+	      || strprefix (argstr, "sstatus")))
+	as_warn (_("The debugger will corrupt sstatus/ba (r30).\n"
+		   "If you don't need to debug this "
+		   "code use .set nobreak to turn off this warning."));
       break;
     case 'i':
     case 'u':
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8f5dc12a56..5513867755 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2013-10-13  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* gas/nios2/warn_nobreak.l: Update text of warning messages.
+	* gas/nios2/registers.s: Use "sstatus" rather than "ba"
+	as the primary name of r30.
+	* gas/nios2/registers.d: Likewise.
+
 2013-10-12  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* gas/i386/mpx.s: Remove bndcl/bndcu/bndcn tests with AX.
diff --git a/gas/testsuite/gas/nios2/registers.d b/gas/testsuite/gas/nios2/registers.d
index 2083ba7b07..7fd64d0773 100644
--- a/gas/testsuite/gas/nios2/registers.d
+++ b/gas/testsuite/gas/nios2/registers.d
@@ -36,7 +36,7 @@ Disassembly of section .text:
 0+006c <[^>]*> 06c01ec4 	movi	sp,123
 0+0070 <[^>]*> 07001ec4 	movi	fp,123
 0+0074 <[^>]*> 07401ec4 	movi	ea,123
-0+0078 <[^>]*> 07801ec4 	movi	ba,123
+0+0078 <[^>]*> 07801ec4 	movi	sstatus,123
 0+007c <[^>]*> 07c01ec4 	movi	ra,123
 0+0080 <[^>]*> 00001ec4 	movi	zero,123
 0+0084 <[^>]*> 00401ec4 	movi	at,123
@@ -46,6 +46,6 @@ Disassembly of section .text:
 0+0094 <[^>]*> 06c01ec4 	movi	sp,123
 0+0098 <[^>]*> 07001ec4 	movi	fp,123
 0+009c <[^>]*> 07401ec4 	movi	ea,123
-0+00a0 <[^>]*> 07801ec4 	movi	ba,123
-0+00a4 <[^>]*> 07801ec4 	movi	ba,123
+0+00a0 <[^>]*> 07801ec4 	movi	sstatus,123
+0+00a4 <[^>]*> 07801ec4 	movi	sstatus,123
 0+00a8 <[^>]*> 07c01ec4 	movi	ra,123
diff --git a/gas/testsuite/gas/nios2/registers.s b/gas/testsuite/gas/nios2/registers.s
index df8217f942..6c2b124904 100644
--- a/gas/testsuite/gas/nios2/registers.s
+++ b/gas/testsuite/gas/nios2/registers.s
@@ -35,7 +35,7 @@ foo:
 	movi sp, 123
 	movi fp, 123
 	movi ea, 123
-	movi ba, 123
+	movi sstatus, 123
 	movi ra, 123
 # Alternative names for special registers
 	movi r0, 123
@@ -47,5 +47,5 @@ foo:
 	movi r28, 123
 	movi r29, 123
 	movi r30, 123
-	movi sstatus, 123
+	movi ba, 123
 	movi r31, 123
diff --git a/gas/testsuite/gas/nios2/warn_nobreak.l b/gas/testsuite/gas/nios2/warn_nobreak.l
index 539813d683..d68949d895 100644
--- a/gas/testsuite/gas/nios2/warn_nobreak.l
+++ b/gas/testsuite/gas/nios2/warn_nobreak.l
@@ -1,9 +1,9 @@
 .*warn_nobreak.s: Assembler messages:
-.*warn_nobreak.s:2: Warning: The debugger will corrupt ba \(r30\). If you don't need to debug this
-code then use .set nobreak to turn off this warning.
-.*warn_nobreak.s:3: Warning: The debugger will corrupt bt \(r25\). If you don't need to debug this
-code then use .set nobreak to turn off this warning.
-.*warn_nobreak.s:11: Warning: The debugger will corrupt ba \(r30\). If you don't need to debug this
-code then use .set nobreak to turn off this warning.
-.*warn_nobreak.s:12: Warning: The debugger will corrupt bt \(r25\). If you don't need to debug this
-code then use .set nobreak to turn off this warning.
+.*warn_nobreak.s:2: Warning: The debugger will corrupt sstatus/ba \(r30\).
+If you don't need to debug this code use .set nobreak to turn off this warning.
+.*warn_nobreak.s:3: Warning: The debugger will corrupt bt \(r25\).
+If you don't need to debug this code use .set nobreak to turn off this warning.
+.*warn_nobreak.s:11: Warning: The debugger will corrupt sstatus/ba \(r30\).
+If you don't need to debug this code use .set nobreak to turn off this warning.
+.*warn_nobreak.s:12: Warning: The debugger will corrupt bt \(r25\).
+If you don't need to debug this code use .set nobreak to turn off this warning.
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8d787daaa1..15a6029b91 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-13  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* nios2-opc.c (nios2_builtin_reg): Use "sstatus" rather than "ba"
+	as the primary name of r30.
+
 2013-10-12  Jan Beulich <jbeulich@suse.com>
 
 	* i386-dis.c (intel_operand_size): Move v_bnd_mode alongside the
diff --git a/opcodes/nios2-opc.c b/opcodes/nios2-opc.c
index 83cf1898af..c0ec617a56 100644
--- a/opcodes/nios2-opc.c
+++ b/opcodes/nios2-opc.c
@@ -58,7 +58,7 @@ const struct nios2_reg nios2_builtin_regs[] = {
   {"sp", 27},			/* stack pointer */
   {"fp", 28},			/* frame pointer */
   {"ea", 29},			/* exception return address */
-  {"ba", 30},			/* breakpoint return address */
+  {"sstatus", 30},		/* saved processor status */
   {"ra", 31},			/* return address */
 
   /* Alternative names for special registers.  */
@@ -71,7 +71,7 @@ const struct nios2_reg nios2_builtin_regs[] = {
   {"r28", 28},
   {"r29", 29},
   {"r30", 30},
-  {"sstatus", 30},
+  {"ba", 30},			/* breakpoint return address */
   {"r31", 31},
 
   /* Control register names.  */