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

	gdb/
	* nios2-tdep.c (nios2_reg_names): Use "sstatus" rather than "ba"
	as the preferred name of r30.
	* nios2-linux-tdep.c (reg_offsets): Likewise.
	* features/nios2-cpu.xml: Likewise.
	* features/nios2-linux.c: Regenerated.
	* features/nios2.c: Regenerated.
	* regformats/nios2-linux.dat: Regenerated.

7 files changed, 16 insertions, 6 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ef37d1427d7..ce2538791ca 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2013-10-13  Sandra Loosemore  <sandra@codesourcery.com>
+
+	* nios2-tdep.c (nios2_reg_names): Use "sstatus" rather than "ba"
+	as the preferred name of r30.
+	* nios2-linux-tdep.c (reg_offsets): Likewise.
+	* features/nios2-cpu.xml: Likewise.
+	* features/nios2-linux.c: Regenerated.
+	* features/nios2.c: Regenerated.
+	* regformats/nios2-linux.dat: Regenerated.
+
 2013-10-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	Canonicalize directories for EXEC_FILENAME.
diff --git a/gdb/features/nios2-cpu.xml b/gdb/features/nios2-cpu.xml
index a4146a655bb..8fc33dc416f 100644
--- a/gdb/features/nios2-cpu.xml
+++ b/gdb/features/nios2-cpu.xml
@@ -37,7 +37,7 @@
   <reg name="sp" bitsize="32" type="data_ptr"/>
   <reg name="fp" bitsize="32" type="uint32"/>
   <reg name="ea" bitsize="32" type="uint32"/>
-  <reg name="ba" bitsize="32" type="uint32"/>
+  <reg name="sstatus" bitsize="32" type="uint32"/>
   <reg name="ra" bitsize="32" type="uint32"/>
   <reg name="pc" bitsize="32" type="code_ptr"/>
   <reg name="status" bitsize="32" type="uint32"/>
diff --git a/gdb/features/nios2-linux.c b/gdb/features/nios2-linux.c
index d384d7f01c5..ea61cf884f5 100644
--- a/gdb/features/nios2-linux.c
+++ b/gdb/features/nios2-linux.c
@@ -47,7 +47,7 @@ initialize_tdesc_nios2_linux (void)
   tdesc_create_reg (feature, "sp", 27, 1, NULL, 32, "data_ptr");
   tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "ba", 30, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "sstatus", 30, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "pc", 32, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "status", 33, 1, NULL, 32, "uint32");
diff --git a/gdb/features/nios2.c b/gdb/features/nios2.c
index cb7246d8805..8e0049df1d3 100644
--- a/gdb/features/nios2.c
+++ b/gdb/features/nios2.c
@@ -45,7 +45,7 @@ initialize_tdesc_nios2 (void)
   tdesc_create_reg (feature, "sp", 27, 1, NULL, 32, "data_ptr");
   tdesc_create_reg (feature, "fp", 28, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "ea", 29, 1, NULL, 32, "uint32");
-  tdesc_create_reg (feature, "ba", 30, 1, NULL, 32, "uint32");
+  tdesc_create_reg (feature, "sstatus", 30, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "ra", 31, 1, NULL, 32, "uint32");
   tdesc_create_reg (feature, "pc", 32, 1, NULL, 32, "code_ptr");
   tdesc_create_reg (feature, "status", 33, 1, NULL, 32, "uint32");
diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c
index 67f400701b3..47b98cc866c 100644
--- a/gdb/nios2-linux-tdep.c
+++ b/gdb/nios2-linux-tdep.c
@@ -45,7 +45,7 @@ static const int reg_offsets[NIOS2_NUM_REGS] =
   -1,  8,  9, 10, 11, 12, 13, 14,	/* r0 - r7 */
   0,  1,  2,  3,  4,  5,  6,  7,	/* r8 - r15 */
   23, 24, 25, 26, 27, 28, 29, 30,	/* r16 - r23 */
-  -1, -1, 19, 18, 17, 21, -1, 16,	/* et bt gp sp fp ea ba ra */
+  -1, -1, 19, 18, 17, 21, -1, 16,	/* et bt gp sp fp ea sstatus ra */
   21,					/* pc */
   -1, 20, -1, -1, -1, -1, -1, -1,	/* status estatus ...  */
   -1, -1, -1, -1, -1, -1, -1, -1
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 5b9e2e6a373..ff644b49ee9 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -164,7 +164,7 @@ static const char *const nios2_reg_names[NIOS2_NUM_REGS] =
   "zero", "at", "r2", "r3", "r4", "r5", "r6", "r7",
   "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
   "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
-  "et", "bt", "gp", "sp", "fp", "ea", "ba", "ra",
+  "et", "bt", "gp", "sp", "fp", "ea", "sstatus", "ra",
   "pc",
   "status", "estatus", "bstatus", "ienable",
   "ipending", "cpuid", "ctl6", "exception",
diff --git a/gdb/regformats/nios2-linux.dat b/gdb/regformats/nios2-linux.dat
index 0b89d53d2d1..94a36d6e613 100644
--- a/gdb/regformats/nios2-linux.dat
+++ b/gdb/regformats/nios2-linux.dat
@@ -32,7 +32,7 @@ expedite:sp,pc
 32:sp
 32:fp
 32:ea
-32:ba
+32:sstatus
 32:ra
 32:pc
 32:status