Blame SOURCES/gdb-rhbz1105165-ibm-tdb-support-system-z-1of9.patch

7b26da
From 2ccd146855365598ad2644ef8139f2f2a6747b90 Mon Sep 17 00:00:00 2001
7b26da
From: Ulrich Weigand <uweigand@de.ibm.com>
7b26da
Date: Fri, 13 Sep 2013 14:11:15 +0000
7b26da
Subject: [PATCH 2/3] 2013-09-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
7b26da
7b26da
	* s390-tdep.h (S390_IS_GREGSET_REGNUM): New macro.
7b26da
	(S390_IS_FPREGSET_REGNUM): New macro.
7b26da
	* s390-tdep.c (s390_dwarf_regmap): Make const.
7b26da
	(regnum_is_gpr_full): New function for replacing repeated code.
7b26da
	(s390_pseudo_register_name): Use it.
7b26da
	(s390_pseudo_register_type): Likewise.
7b26da
	(s390_pseudo_register_read): Likewise.
7b26da
	(s390_pseudo_register_write): Likewise.
7b26da
	(s390_unwind_pseudo_register): Likewise.
7b26da
	(s390_regmap_gregset): New format for regmap.
7b26da
	(s390x_regmap_gregset): Likewise.
7b26da
	(s390_regmap_fpregset): Likewise.
7b26da
	(s390_regmap_upper): Likewise.
7b26da
	(s390_regmap_last_break): Likewise.
7b26da
	(s390_regmap_system_call): Likewise.
7b26da
	(s390_supply_regset): Adjust to new regmap format.
7b26da
	(s390_collect_regset): Likewise.
7b26da
	* s390-nat.c (s390_native_supply): Adjust to new regmap format.
7b26da
	(s390_native_collect): Likewise.
7b26da
	(supply_gregset): Likewise.
7b26da
	(fill_gregset): Likewise.
7b26da
	(supply_fpregset): Likewise.
7b26da
	(fill_fpregset): Likewise.
7b26da
	(fetch_regset): Likewise.
7b26da
	(store_regset): Likewise.
7b26da
	(s390_linux_fetch_inferior_registers): Likewise.
7b26da
	(s390_linux_fetch_inferior_registers): Likewise.
7b26da
---
7b26da
 gdb/ChangeLog   |  30 +++++
7b26da
 gdb/s390-nat.c  | 233 +++++++++++++++++------------------
7b26da
 gdb/s390-tdep.c | 369 +++++++++++++++++++++++++++-----------------------------
7b26da
 gdb/s390-tdep.h |  20 ++-
7b26da
 4 files changed, 328 insertions(+), 324 deletions(-)
7b26da
7b26da
Index: gdb-7.6.1/gdb/s390-nat.c
7b26da
===================================================================
7b26da
--- gdb-7.6.1.orig/gdb/s390-nat.c
7b26da
+++ gdb-7.6.1/gdb/s390-nat.c
7b26da
@@ -63,139 +63,139 @@ static int have_regset_system_call = 0;
7b26da
 
7b26da
 #define regmap_fpregset s390_regmap_fpregset
7b26da
 
7b26da
-/* When debugging a 32-bit executable running under a 64-bit kernel,
7b26da
-   we have to fix up the 64-bit registers we get from the kernel
7b26da
-   to make them look like 32-bit registers.  */
7b26da
+/* Fill the regset described by MAP into REGCACHE, using the values
7b26da
+   from REGP.  The MAP array represents each register as a pair
7b26da
+   (offset, regno) of short integers and is terminated with -1. */
7b26da
 
7b26da
 static void
7b26da
-s390_native_supply (struct regcache *regcache, int regno,
7b26da
-		    const gdb_byte *regp, int *regmap)
7b26da
+s390_native_supply (struct regcache *regcache, const short *map,
7b26da
+		    const gdb_byte *regp)
7b26da
 {
7b26da
-  int offset = regmap[regno];
7b26da
+  for (; map[0] >= 0; map += 2)
7b26da
+    regcache_raw_supply (regcache, map[1], regp + map[0]);
7b26da
+}
7b26da
+
7b26da
+/* Collect the register REGNO out of the regset described by MAP from
7b26da
+   REGCACHE into REGP.  If REGNO == -1, do this for all registers in
7b26da
+   this regset. */
7b26da
 
7b26da
+static void
7b26da
+s390_native_collect (const struct regcache *regcache, const short *map,
7b26da
+		     int regno, gdb_byte *regp)
7b26da
+{
7b26da
+  for (; map[0] >= 0; map += 2)
7b26da
+    if (regno == -1 || regno == map[1])
7b26da
+      regcache_raw_collect (regcache, map[1], regp + map[0]);
7b26da
+}
7b26da
+
7b26da
+/* Fill GDB's register array with the general-purpose register values
7b26da
+   in *REGP.
7b26da
+
7b26da
+   When debugging a 32-bit executable running under a 64-bit kernel,
7b26da
+   we have to fix up the 64-bit registers we get from the kernel to
7b26da
+   make them look like 32-bit registers.  */
7b26da
+
7b26da
+void
7b26da
+supply_gregset (struct regcache *regcache, const gregset_t *regp)
7b26da
+{
7b26da
 #ifdef __s390x__
7b26da
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
7b26da
-  if (offset != -1 && gdbarch_ptr_bit (gdbarch) == 32)
7b26da
+  if (gdbarch_ptr_bit (gdbarch) == 32)
7b26da
     {
7b26da
       enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
7b26da
+      ULONGEST pswm = 0, pswa = 0;
7b26da
+      gdb_byte buf[4];
7b26da
+      const short *map;
7b26da
 
7b26da
-      if (regno == S390_PSWM_REGNUM)
7b26da
-	{
7b26da
-	  ULONGEST pswm;
7b26da
-	  gdb_byte buf[4];
7b26da
-
7b26da
-	  pswm = extract_unsigned_integer (regp + regmap[S390_PSWM_REGNUM],
7b26da
-					   8, byte_order);
7b26da
-
7b26da
-	  store_unsigned_integer (buf, 4, byte_order, (pswm >> 32) | 0x80000);
7b26da
-	  regcache_raw_supply (regcache, regno, buf);
7b26da
-	  return;
7b26da
-	}
7b26da
-
7b26da
-      if (regno == S390_PSWA_REGNUM)
7b26da
+      for (map = regmap_gregset; map[0] >= 0; map += 2)
7b26da
 	{
7b26da
-	  ULONGEST pswm, pswa;
7b26da
-	  gdb_byte buf[4];
7b26da
+	  const gdb_byte *p = (const gdb_byte *) regp + map[0];
7b26da
+	  int regno = map[1];
7b26da
 
7b26da
-	  pswa = extract_unsigned_integer (regp + regmap[S390_PSWA_REGNUM],
7b26da
-					   8, byte_order);
7b26da
-	  pswm = extract_unsigned_integer (regp + regmap[S390_PSWM_REGNUM],
7b26da
-					   8, byte_order);
7b26da
-
7b26da
-	  store_unsigned_integer (buf, 4, byte_order,
7b26da
-				  (pswa & 0x7fffffff) | (pswm & 0x80000000));
7b26da
-	  regcache_raw_supply (regcache, regno, buf);
7b26da
-	  return;
7b26da
+	  if (regno == S390_PSWM_REGNUM)
7b26da
+	    pswm = extract_unsigned_integer (p, 8, byte_order);
7b26da
+	  else if (regno == S390_PSWA_REGNUM)
7b26da
+	    pswa = extract_unsigned_integer (p, 8, byte_order);
7b26da
+	  else
7b26da
+	    {
7b26da
+	      if ((regno >= S390_R0_REGNUM && regno <= S390_R15_REGNUM)
7b26da
+		  || regno == S390_ORIG_R2_REGNUM)
7b26da
+		p += 4;
7b26da
+	      regcache_raw_supply (regcache, regno, p);
7b26da
+	    }
7b26da
 	}
7b26da
 
7b26da
-      if ((regno >= S390_R0_REGNUM && regno <= S390_R15_REGNUM)
7b26da
-	  || regno == S390_ORIG_R2_REGNUM)
7b26da
-	offset += 4;
7b26da
+      store_unsigned_integer (buf, 4, byte_order, (pswm >> 32) | 0x80000);
7b26da
+      regcache_raw_supply (regcache, S390_PSWM_REGNUM, buf);
7b26da
+      store_unsigned_integer (buf, 4, byte_order,
7b26da
+			      (pswa & 0x7fffffff) | (pswm & 0x80000000));
7b26da
+      regcache_raw_supply (regcache, S390_PSWA_REGNUM, buf);
7b26da
+      return;
7b26da
     }
7b26da
 #endif
7b26da
 
7b26da
-  if (offset != -1)
7b26da
-    regcache_raw_supply (regcache, regno, regp + offset);
7b26da
+  s390_native_supply (regcache, regmap_gregset, (const gdb_byte *) regp);
7b26da
 }
7b26da
 
7b26da
-static void
7b26da
-s390_native_collect (const struct regcache *regcache, int regno,
7b26da
-		     gdb_byte *regp, int *regmap)
7b26da
-{
7b26da
-  int offset = regmap[regno];
7b26da
+/* Fill register REGNO (if it is a general-purpose register) in
7b26da
+   *REGP with the value in GDB's register array.  If REGNO is -1,
7b26da
+   do this for all registers.  */
7b26da
 
7b26da
+void
7b26da
+fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno)
7b26da
+{
7b26da
 #ifdef __s390x__
7b26da
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
7b26da
-  if (offset != -1 && gdbarch_ptr_bit (gdbarch) == 32)
7b26da
+  if (gdbarch_ptr_bit (gdbarch) == 32)
7b26da
     {
7b26da
-      enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
7b26da
+      gdb_byte *psw_p[2];
7b26da
+      const short *map;
7b26da
 
7b26da
-      if (regno == S390_PSWM_REGNUM)
7b26da
+      for (map = regmap_gregset; map[0] >= 0; map += 2)
7b26da
 	{
7b26da
-	  ULONGEST pswm;
7b26da
-	  gdb_byte buf[4];
7b26da
+	  gdb_byte *p = (gdb_byte *) regp + map[0];
7b26da
+	  int reg = map[1];
7b26da
 
7b26da
-	  regcache_raw_collect (regcache, regno, buf);
7b26da
-	  pswm = extract_unsigned_integer (buf, 4, byte_order);
7b26da
+	  if (reg >= S390_PSWM_REGNUM && reg <= S390_PSWA_REGNUM)
7b26da
+	    psw_p[reg - S390_PSWM_REGNUM] = p;
7b26da
 
7b26da
-	  /* We don't know the final addressing mode until the PSW address
7b26da
-	     is known, so leave it as-is.  When the PSW address is collected
7b26da
-	     (below), the addressing mode will be updated.  */
7b26da
-	  store_unsigned_integer (regp + regmap[S390_PSWM_REGNUM],
7b26da
-				  4, byte_order, pswm & 0xfff7ffff);
7b26da
-	  return;
7b26da
+	  else if (regno == -1 || regno == reg)
7b26da
+	    {
7b26da
+	      if ((reg >= S390_R0_REGNUM && reg <= S390_R15_REGNUM)
7b26da
+		  || reg == S390_ORIG_R2_REGNUM)
7b26da
+		{
7b26da
+		  memset (p, 0, 4);
7b26da
+		  p += 4;
7b26da
+		}
7b26da
+	      regcache_raw_collect (regcache, reg, p + 4);
7b26da
+	    }
7b26da
 	}
7b26da
 
7b26da
-      if (regno == S390_PSWA_REGNUM)
7b26da
+      if (regno == -1
7b26da
+	  || regno == S390_PSWM_REGNUM || regno == S390_PSWA_REGNUM)
7b26da
 	{
7b26da
-	  ULONGEST pswa;
7b26da
+	  enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
7b26da
+	  ULONGEST pswa, pswm;
7b26da
 	  gdb_byte buf[4];
7b26da
 
7b26da
-	  regcache_raw_collect (regcache, regno, buf);
7b26da
+	  regcache_raw_collect (regcache, S390_PSWM_REGNUM, buf);
7b26da
+	  pswm = extract_unsigned_integer (buf, 4, byte_order);
7b26da
+	  regcache_raw_collect (regcache, S390_PSWA_REGNUM, buf);
7b26da
 	  pswa = extract_unsigned_integer (buf, 4, byte_order);
7b26da
 
7b26da
-	  store_unsigned_integer (regp + regmap[S390_PSWA_REGNUM],
7b26da
-				  8, byte_order, pswa & 0x7fffffff);
7b26da
-
7b26da
-	  /* Update basic addressing mode bit in PSW mask, see above.  */
7b26da
-	  store_unsigned_integer (regp + regmap[S390_PSWM_REGNUM] + 4,
7b26da
-				  4, byte_order, pswa & 0x80000000);
7b26da
-	  return;
7b26da
-	}
7b26da
-
7b26da
-      if ((regno >= S390_R0_REGNUM && regno <= S390_R15_REGNUM)
7b26da
-	  || regno == S390_ORIG_R2_REGNUM)
7b26da
-	{
7b26da
-	  memset (regp + offset, 0, 4);
7b26da
-	  offset += 4;
7b26da
+	  if (regno == -1 || regno == S390_PSWM_REGNUM)
7b26da
+	    store_unsigned_integer (psw_p[0], 8, byte_order,
7b26da
+				    ((pswm & 0xfff7ffff) << 32) |
7b26da
+				    (pswa & 0x80000000));
7b26da
+	  if (regno == -1 || regno == S390_PSWA_REGNUM)
7b26da
+	    store_unsigned_integer (psw_p[1], 8, byte_order,
7b26da
+				    pswa & 0x7fffffff);
7b26da
 	}
7b26da
+      return;
7b26da
     }
7b26da
 #endif
7b26da
 
7b26da
-  if (offset != -1)
7b26da
-    regcache_raw_collect (regcache, regno, regp + offset);
7b26da
-}
7b26da
-
7b26da
-/* Fill GDB's register array with the general-purpose register values
7b26da
-   in *REGP.  */
7b26da
-void
7b26da
-supply_gregset (struct regcache *regcache, const gregset_t *regp)
7b26da
-{
7b26da
-  int i;
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    s390_native_supply (regcache, i, (const gdb_byte *) regp, regmap_gregset);
7b26da
-}
7b26da
-
7b26da
-/* Fill register REGNO (if it is a general-purpose register) in
7b26da
-   *REGP with the value in GDB's register array.  If REGNO is -1,
7b26da
-   do this for all registers.  */
7b26da
-void
7b26da
-fill_gregset (const struct regcache *regcache, gregset_t *regp, int regno)
7b26da
-{
7b26da
-  int i;
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    if (regno == -1 || regno == i)
7b26da
-      s390_native_collect (regcache, i, (gdb_byte *) regp, regmap_gregset);
7b26da
+  s390_native_collect (regcache, regmap_gregset, regno, (gdb_byte *) regp);
7b26da
 }
7b26da
 
7b26da
 /* Fill GDB's register array with the floating-point register values
7b26da
@@ -203,9 +203,7 @@ fill_gregset (const struct regcache *reg
7b26da
 void
7b26da
 supply_fpregset (struct regcache *regcache, const fpregset_t *regp)
7b26da
 {
7b26da
-  int i;
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    s390_native_supply (regcache, i, (const gdb_byte *) regp, regmap_fpregset);
7b26da
+  s390_native_supply (regcache, regmap_fpregset, (const gdb_byte *) regp);
7b26da
 }
7b26da
 
7b26da
 /* Fill register REGNO (if it is a general-purpose register) in
7b26da
@@ -214,10 +212,7 @@ supply_fpregset (struct regcache *regcac
7b26da
 void
7b26da
 fill_fpregset (const struct regcache *regcache, fpregset_t *regp, int regno)
7b26da
 {
7b26da
-  int i;
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    if (regno == -1 || regno == i)
7b26da
-      s390_native_collect (regcache, i, (gdb_byte *) regp, regmap_fpregset);
7b26da
+  s390_native_collect (regcache, regmap_fpregset, regno, (gdb_byte *) regp);
7b26da
 }
7b26da
 
7b26da
 /* Find the TID for the current inferior thread to use with ptrace.  */
7b26da
@@ -311,12 +306,10 @@ store_fpregs (const struct regcache *reg
7b26da
    process/thread TID and store their values in GDB's register cache.  */
7b26da
 static void
7b26da
 fetch_regset (struct regcache *regcache, int tid,
7b26da
-	      int regset, int regsize, int *regmap)
7b26da
+	      int regset, int regsize, const short *regmap)
7b26da
 {
7b26da
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
7b26da
   gdb_byte *buf = alloca (regsize);
7b26da
   struct iovec iov;
7b26da
-  int i;
7b26da
 
7b26da
   iov.iov_base = buf;
7b26da
   iov.iov_len = regsize;
7b26da
@@ -324,8 +317,7 @@ fetch_regset (struct regcache *regcache,
7b26da
   if (ptrace (PTRACE_GETREGSET, tid, (long) regset, (long) &iov) < 0)
7b26da
     perror_with_name (_("Couldn't get register set"));
7b26da
 
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    s390_native_supply (regcache, i, buf, regmap);
7b26da
+  s390_native_supply (regcache, regmap, buf);
7b26da
 }
7b26da
 
7b26da
 /* Store all registers in the kernel's register set whose number is REGSET,
7b26da
@@ -333,12 +325,10 @@ fetch_regset (struct regcache *regcache,
7b26da
    GDB's register cache back to process/thread TID.  */
7b26da
 static void
7b26da
 store_regset (struct regcache *regcache, int tid,
7b26da
-	      int regset, int regsize, int *regmap)
7b26da
+	      int regset, int regsize, const short *regmap)
7b26da
 {
7b26da
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
7b26da
   gdb_byte *buf = alloca (regsize);
7b26da
   struct iovec iov;
7b26da
-  int i;
7b26da
 
7b26da
   iov.iov_base = buf;
7b26da
   iov.iov_len = regsize;
7b26da
@@ -346,8 +336,7 @@ store_regset (struct regcache *regcache,
7b26da
   if (ptrace (PTRACE_GETREGSET, tid, (long) regset, (long) &iov) < 0)
7b26da
     perror_with_name (_("Couldn't get register set"));
7b26da
 
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    s390_native_collect (regcache, i, buf, regmap);
7b26da
+  s390_native_collect (regcache, regmap, -1, buf);
7b26da
 
7b26da
   if (ptrace (PTRACE_SETREGSET, tid, (long) regset, (long) &iov) < 0)
7b26da
     perror_with_name (_("Couldn't set register set"));
7b26da
@@ -378,12 +367,10 @@ s390_linux_fetch_inferior_registers (str
7b26da
 {
7b26da
   int tid = s390_inferior_tid ();
7b26da
 
7b26da
-  if (regnum == -1 
7b26da
-      || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1))
7b26da
+  if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
7b26da
     fetch_regs (regcache, tid);
7b26da
 
7b26da
-  if (regnum == -1 
7b26da
-      || (regnum < S390_NUM_REGS && regmap_fpregset[regnum] != -1))
7b26da
+  if (regnum == -1 || S390_IS_FPREGSET_REGNUM (regnum))
7b26da
     fetch_fpregs (regcache, tid);
7b26da
 
7b26da
   if (have_regset_last_break)
7b26da
@@ -406,12 +393,10 @@ s390_linux_store_inferior_registers (str
7b26da
 {
7b26da
   int tid = s390_inferior_tid ();
7b26da
 
7b26da
-  if (regnum == -1 
7b26da
-      || (regnum < S390_NUM_REGS && regmap_gregset[regnum] != -1))
7b26da
+  if (regnum == -1 || S390_IS_GREGSET_REGNUM (regnum))
7b26da
     store_regs (regcache, tid, regnum);
7b26da
 
7b26da
-  if (regnum == -1 
7b26da
-      || (regnum < S390_NUM_REGS && regmap_fpregset[regnum] != -1))
7b26da
+  if (regnum == -1 || S390_IS_FPREGSET_REGNUM (regnum))
7b26da
     store_fpregs (regcache, tid, regnum);
7b26da
 
7b26da
   /* S390_LAST_BREAK_REGNUM is read-only.  */
7b26da
Index: gdb-7.6.1/gdb/s390-tdep.c
7b26da
===================================================================
7b26da
--- gdb-7.6.1.orig/gdb/s390-tdep.c
7b26da
+++ gdb-7.6.1/gdb/s390-tdep.c
7b26da
@@ -141,7 +141,7 @@ s390_write_pc (struct regcache *regcache
7b26da
 
7b26da
 /* DWARF Register Mapping.  */
7b26da
 
7b26da
-static int s390_dwarf_regmap[] =
7b26da
+static const short s390_dwarf_regmap[] =
7b26da
 {
7b26da
   /* General Purpose Registers.  */
7b26da
   S390_R0_REGNUM, S390_R1_REGNUM, S390_R2_REGNUM, S390_R3_REGNUM,
7b26da
@@ -212,6 +212,14 @@ s390_adjust_frame_regnum (struct gdbarch
7b26da
 
7b26da
 /* Pseudo registers.  */
7b26da
 
7b26da
+static int
7b26da
+regnum_is_gpr_full (struct gdbarch_tdep *tdep, int regnum)
7b26da
+{
7b26da
+  return (tdep->gpr_full_regnum != -1
7b26da
+	  && regnum >= tdep->gpr_full_regnum
7b26da
+	  && regnum <= tdep->gpr_full_regnum + 15);
7b26da
+}
7b26da
+
7b26da
 static const char *
7b26da
 s390_pseudo_register_name (struct gdbarch *gdbarch, int regnum)
7b26da
 {
7b26da
@@ -223,9 +231,7 @@ s390_pseudo_register_name (struct gdbarc
7b26da
   if (regnum == tdep->cc_regnum)
7b26da
     return "cc";
7b26da
 
7b26da
-  if (tdep->gpr_full_regnum != -1
7b26da
-      && regnum >= tdep->gpr_full_regnum
7b26da
-      && regnum < tdep->gpr_full_regnum + 16)
7b26da
+  if (regnum_is_gpr_full (tdep, regnum))
7b26da
     {
7b26da
       static const char *full_name[] = {
7b26da
 	"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
7b26da
@@ -248,9 +254,7 @@ s390_pseudo_register_type (struct gdbarc
7b26da
   if (regnum == tdep->cc_regnum)
7b26da
     return builtin_type (gdbarch)->builtin_int;
7b26da
 
7b26da
-  if (tdep->gpr_full_regnum != -1
7b26da
-      && regnum >= tdep->gpr_full_regnum
7b26da
-      && regnum < tdep->gpr_full_regnum + 16)
7b26da
+  if (regnum_is_gpr_full (tdep, regnum))
7b26da
     return builtin_type (gdbarch)->builtin_uint64;
7b26da
 
7b26da
   internal_error (__FILE__, __LINE__, _("invalid regnum"));
7b26da
@@ -295,9 +299,7 @@ s390_pseudo_register_read (struct gdbarc
7b26da
       return status;
7b26da
     }
7b26da
 
7b26da
-  if (tdep->gpr_full_regnum != -1
7b26da
-      && regnum >= tdep->gpr_full_regnum
7b26da
-      && regnum < tdep->gpr_full_regnum + 16)
7b26da
+  if (regnum_is_gpr_full (tdep, regnum))
7b26da
     {
7b26da
       enum register_status status;
7b26da
       ULONGEST val_upper;
7b26da
@@ -352,9 +354,7 @@ s390_pseudo_register_write (struct gdbar
7b26da
       return;
7b26da
     }
7b26da
 
7b26da
-  if (tdep->gpr_full_regnum != -1
7b26da
-      && regnum >= tdep->gpr_full_regnum
7b26da
-      && regnum < tdep->gpr_full_regnum + 16)
7b26da
+  if (regnum_is_gpr_full (tdep, regnum))
7b26da
     {
7b26da
       regnum -= tdep->gpr_full_regnum;
7b26da
       val = extract_unsigned_integer (buf, regsize, byte_order);
7b26da
@@ -409,175 +409,166 @@ s390_pseudo_register_reggroup_p (struct
7b26da
 }
7b26da
 
7b26da
 
7b26da
-/* Core file register sets.  */
7b26da
+/* Maps for register sets.  */
7b26da
 
7b26da
-int s390_regmap_gregset[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  0x00, 0x04,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  0x08, 0x0c, 0x10, 0x14,
7b26da
-  0x18, 0x1c, 0x20, 0x24,
7b26da
-  0x28, 0x2c, 0x30, 0x34,
7b26da
-  0x38, 0x3c, 0x40, 0x44,
7b26da
-  /* Access Registers.  */
7b26da
-  0x48, 0x4c, 0x50, 0x54,
7b26da
-  0x58, 0x5c, 0x60, 0x64,
7b26da
-  0x68, 0x6c, 0x70, 0x74,
7b26da
-  0x78, 0x7c, 0x80, 0x84,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  -1,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  0x88, -1, -1,
7b26da
-};
7b26da
+const short s390_regmap_gregset[] =
7b26da
+  {
7b26da
+    0x00, S390_PSWM_REGNUM,
7b26da
+    0x04, S390_PSWA_REGNUM,
7b26da
+    0x08, S390_R0_REGNUM,
7b26da
+    0x0c, S390_R1_REGNUM,
7b26da
+    0x10, S390_R2_REGNUM,
7b26da
+    0x14, S390_R3_REGNUM,
7b26da
+    0x18, S390_R4_REGNUM,
7b26da
+    0x1c, S390_R5_REGNUM,
7b26da
+    0x20, S390_R6_REGNUM,
7b26da
+    0x24, S390_R7_REGNUM,
7b26da
+    0x28, S390_R8_REGNUM,
7b26da
+    0x2c, S390_R9_REGNUM,
7b26da
+    0x30, S390_R10_REGNUM,
7b26da
+    0x34, S390_R11_REGNUM,
7b26da
+    0x38, S390_R12_REGNUM,
7b26da
+    0x3c, S390_R13_REGNUM,
7b26da
+    0x40, S390_R14_REGNUM,
7b26da
+    0x44, S390_R15_REGNUM,
7b26da
+    0x48, S390_A0_REGNUM,
7b26da
+    0x4c, S390_A1_REGNUM,
7b26da
+    0x50, S390_A2_REGNUM,
7b26da
+    0x54, S390_A3_REGNUM,
7b26da
+    0x58, S390_A4_REGNUM,
7b26da
+    0x5c, S390_A5_REGNUM,
7b26da
+    0x60, S390_A6_REGNUM,
7b26da
+    0x64, S390_A7_REGNUM,
7b26da
+    0x68, S390_A8_REGNUM,
7b26da
+    0x6c, S390_A9_REGNUM,
7b26da
+    0x70, S390_A10_REGNUM,
7b26da
+    0x74, S390_A11_REGNUM,
7b26da
+    0x78, S390_A12_REGNUM,
7b26da
+    0x7c, S390_A13_REGNUM,
7b26da
+    0x80, S390_A14_REGNUM,
7b26da
+    0x84, S390_A15_REGNUM,
7b26da
+    0x88, S390_ORIG_R2_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
 
7b26da
-int s390x_regmap_gregset[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  0x00, 0x08,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  0x10, 0x18, 0x20, 0x28,
7b26da
-  0x30, 0x38, 0x40, 0x48,
7b26da
-  0x50, 0x58, 0x60, 0x68,
7b26da
-  0x70, 0x78, 0x80, 0x88,
7b26da
-  /* Access Registers.  */
7b26da
-  0x90, 0x94, 0x98, 0x9c,
7b26da
-  0xa0, 0xa4, 0xa8, 0xac,
7b26da
-  0xb0, 0xb4, 0xb8, 0xbc,
7b26da
-  0xc0, 0xc4, 0xc8, 0xcc,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  -1,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  0x10, 0x18, 0x20, 0x28,
7b26da
-  0x30, 0x38, 0x40, 0x48,
7b26da
-  0x50, 0x58, 0x60, 0x68,
7b26da
-  0x70, 0x78, 0x80, 0x88,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  0xd0, -1, -1,
7b26da
-};
7b26da
+const short s390x_regmap_gregset[] =
7b26da
+  {
7b26da
+    0x00, S390_PSWM_REGNUM,
7b26da
+    0x08, S390_PSWA_REGNUM,
7b26da
+    0x10, S390_R0_REGNUM,
7b26da
+    0x18, S390_R1_REGNUM,
7b26da
+    0x20, S390_R2_REGNUM,
7b26da
+    0x28, S390_R3_REGNUM,
7b26da
+    0x30, S390_R4_REGNUM,
7b26da
+    0x38, S390_R5_REGNUM,
7b26da
+    0x40, S390_R6_REGNUM,
7b26da
+    0x48, S390_R7_REGNUM,
7b26da
+    0x50, S390_R8_REGNUM,
7b26da
+    0x58, S390_R9_REGNUM,
7b26da
+    0x60, S390_R10_REGNUM,
7b26da
+    0x68, S390_R11_REGNUM,
7b26da
+    0x70, S390_R12_REGNUM,
7b26da
+    0x78, S390_R13_REGNUM,
7b26da
+    0x80, S390_R14_REGNUM,
7b26da
+    0x88, S390_R15_REGNUM,
7b26da
+    0x90, S390_A0_REGNUM,
7b26da
+    0x94, S390_A1_REGNUM,
7b26da
+    0x98, S390_A2_REGNUM,
7b26da
+    0x9c, S390_A3_REGNUM,
7b26da
+    0xa0, S390_A4_REGNUM,
7b26da
+    0xa4, S390_A5_REGNUM,
7b26da
+    0xa8, S390_A6_REGNUM,
7b26da
+    0xac, S390_A7_REGNUM,
7b26da
+    0xb0, S390_A8_REGNUM,
7b26da
+    0xb4, S390_A9_REGNUM,
7b26da
+    0xb8, S390_A10_REGNUM,
7b26da
+    0xbc, S390_A11_REGNUM,
7b26da
+    0xc0, S390_A12_REGNUM,
7b26da
+    0xc4, S390_A13_REGNUM,
7b26da
+    0xc8, S390_A14_REGNUM,
7b26da
+    0xcc, S390_A15_REGNUM,
7b26da
+    0x10, S390_R0_UPPER_REGNUM,
7b26da
+    0x18, S390_R1_UPPER_REGNUM,
7b26da
+    0x20, S390_R2_UPPER_REGNUM,
7b26da
+    0x28, S390_R3_UPPER_REGNUM,
7b26da
+    0x30, S390_R4_UPPER_REGNUM,
7b26da
+    0x38, S390_R5_UPPER_REGNUM,
7b26da
+    0x40, S390_R6_UPPER_REGNUM,
7b26da
+    0x48, S390_R7_UPPER_REGNUM,
7b26da
+    0x50, S390_R8_UPPER_REGNUM,
7b26da
+    0x58, S390_R9_UPPER_REGNUM,
7b26da
+    0x60, S390_R10_UPPER_REGNUM,
7b26da
+    0x68, S390_R11_UPPER_REGNUM,
7b26da
+    0x70, S390_R12_UPPER_REGNUM,
7b26da
+    0x78, S390_R13_UPPER_REGNUM,
7b26da
+    0x80, S390_R14_UPPER_REGNUM,
7b26da
+    0x88, S390_R15_UPPER_REGNUM,
7b26da
+    0xd0, S390_ORIG_R2_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
 
7b26da
-int s390_regmap_fpregset[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  -1, -1,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Access Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  0x00,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  0x08, 0x10, 0x18, 0x20,
7b26da
-  0x28, 0x30, 0x38, 0x40,
7b26da
-  0x48, 0x50, 0x58, 0x60,
7b26da
-  0x68, 0x70, 0x78, 0x80,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  -1, -1, -1,
7b26da
-};
7b26da
+const short s390_regmap_fpregset[] =
7b26da
+  {
7b26da
+    0x00, S390_FPC_REGNUM,
7b26da
+    0x08, S390_F0_REGNUM,
7b26da
+    0x10, S390_F1_REGNUM,
7b26da
+    0x18, S390_F2_REGNUM,
7b26da
+    0x20, S390_F3_REGNUM,
7b26da
+    0x28, S390_F4_REGNUM,
7b26da
+    0x30, S390_F5_REGNUM,
7b26da
+    0x38, S390_F6_REGNUM,
7b26da
+    0x40, S390_F7_REGNUM,
7b26da
+    0x48, S390_F8_REGNUM,
7b26da
+    0x50, S390_F9_REGNUM,
7b26da
+    0x58, S390_F10_REGNUM,
7b26da
+    0x60, S390_F11_REGNUM,
7b26da
+    0x68, S390_F12_REGNUM,
7b26da
+    0x70, S390_F13_REGNUM,
7b26da
+    0x78, S390_F14_REGNUM,
7b26da
+    0x80, S390_F15_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
 
7b26da
-int s390_regmap_upper[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  -1, -1,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Access Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  -1,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  0x00, 0x04, 0x08, 0x0c,
7b26da
-  0x10, 0x14, 0x18, 0x1c,
7b26da
-  0x20, 0x24, 0x28, 0x2c,
7b26da
-  0x30, 0x34, 0x38, 0x3c,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  -1, -1, -1,
7b26da
-};
7b26da
+const short s390_regmap_upper[] =
7b26da
+  {
7b26da
+    0x00, S390_R0_UPPER_REGNUM,
7b26da
+    0x04, S390_R1_UPPER_REGNUM,
7b26da
+    0x08, S390_R2_UPPER_REGNUM,
7b26da
+    0x0c, S390_R3_UPPER_REGNUM,
7b26da
+    0x10, S390_R4_UPPER_REGNUM,
7b26da
+    0x14, S390_R5_UPPER_REGNUM,
7b26da
+    0x18, S390_R6_UPPER_REGNUM,
7b26da
+    0x1c, S390_R7_UPPER_REGNUM,
7b26da
+    0x20, S390_R8_UPPER_REGNUM,
7b26da
+    0x24, S390_R9_UPPER_REGNUM,
7b26da
+    0x28, S390_R10_UPPER_REGNUM,
7b26da
+    0x2c, S390_R11_UPPER_REGNUM,
7b26da
+    0x30, S390_R12_UPPER_REGNUM,
7b26da
+    0x34, S390_R13_UPPER_REGNUM,
7b26da
+    0x38, S390_R14_UPPER_REGNUM,
7b26da
+    0x3c, S390_R15_UPPER_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
 
7b26da
-int s390_regmap_last_break[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  -1, -1,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Access Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  -1,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  -1, 4, -1,
7b26da
-};
7b26da
+const short s390_regmap_last_break[] =
7b26da
+  {
7b26da
+    0x04, S390_LAST_BREAK_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
+
7b26da
+const short s390x_regmap_last_break[] =
7b26da
+  {
7b26da
+    0x00, S390_LAST_BREAK_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
+
7b26da
+const short s390_regmap_system_call[] =
7b26da
+  {
7b26da
+    0x00, S390_SYSTEM_CALL_REGNUM,
7b26da
+    -1, -1
7b26da
+  };
7b26da
 
7b26da
-int s390x_regmap_last_break[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  -1, -1,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Access Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  -1,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  -1, 0, -1,
7b26da
-};
7b26da
 
7b26da
-int s390_regmap_system_call[S390_NUM_REGS] =
7b26da
-{
7b26da
-  /* Program Status Word.  */
7b26da
-  -1, -1,
7b26da
-  /* General Purpose Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Access Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* Floating Point Control Word.  */
7b26da
-  -1,
7b26da
-  /* Floating Point Registers.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GPR Uppper Halves.  */
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  -1, -1, -1, -1, -1, -1, -1, -1,
7b26da
-  /* GNU/Linux-specific optional "registers".  */
7b26da
-  -1, -1, 0,
7b26da
-};
7b26da
 
7b26da
 /* Supply register REGNUM from the register set REGSET to register cache 
7b26da
    REGCACHE.  If REGNUM is -1, do this for all registers in REGSET.  */
7b26da
@@ -585,14 +576,10 @@ static void
7b26da
 s390_supply_regset (const struct regset *regset, struct regcache *regcache,
7b26da
 		    int regnum, const void *regs, size_t len)
7b26da
 {
7b26da
-  const int *offset = regset->descr;
7b26da
-  int i;
7b26da
-
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    {
7b26da
-      if ((regnum == i || regnum == -1) && offset[i] != -1)
7b26da
-	regcache_raw_supply (regcache, i, (const char *)regs + offset[i]);
7b26da
-    }
7b26da
+  const short *map;
7b26da
+  for (map = regset->descr; map[0] >= 0; map += 2)
7b26da
+    if (regnum == -1 || regnum == map[1])
7b26da
+      regcache_raw_supply (regcache, map[1], (const char *)regs + map[0]);
7b26da
 }
7b26da
 
7b26da
 /* Collect register REGNUM from the register cache REGCACHE and store
7b26da
@@ -604,14 +591,10 @@ s390_collect_regset (const struct regset
7b26da
 		     const struct regcache *regcache,
7b26da
 		     int regnum, void *regs, size_t len)
7b26da
 {
7b26da
-  const int *offset = regset->descr;
7b26da
-  int i;
7b26da
-
7b26da
-  for (i = 0; i < S390_NUM_REGS; i++)
7b26da
-    {
7b26da
-      if ((regnum == i || regnum == -1) && offset[i] != -1)
7b26da
-	regcache_raw_collect (regcache, i, (char *)regs + offset[i]);
7b26da
-    }
7b26da
+  const short *map;
7b26da
+  for (map = regset->descr; map[0] >= 0; map += 2)
7b26da
+    if (regnum == -1 || regnum == map[1])
7b26da
+      regcache_raw_collect (regcache, map[1], (char *)regs + map[0]);
7b26da
 }
7b26da
 
7b26da
 static const struct regset s390_gregset = {
7b26da
@@ -1718,9 +1701,7 @@ s390_unwind_pseudo_register (struct fram
7b26da
 
7b26da
   /* Unwind full GPRs to show at least the lower halves (as the
7b26da
      upper halves are undefined).  */
7b26da
-  if (tdep->gpr_full_regnum != -1
7b26da
-      && regnum >= tdep->gpr_full_regnum
7b26da
-      && regnum < tdep->gpr_full_regnum + 16)
7b26da
+  if (regnum_is_gpr_full (tdep, regnum))
7b26da
     {
7b26da
       int reg = regnum - tdep->gpr_full_regnum;
7b26da
       struct value *val;
7b26da
Index: gdb-7.6.1/gdb/s390-tdep.h
7b26da
===================================================================
7b26da
--- gdb-7.6.1.orig/gdb/s390-tdep.h
7b26da
+++ gdb-7.6.1/gdb/s390-tdep.h
7b26da
@@ -106,16 +106,24 @@
7b26da
 #define S390_RETADDR_REGNUM S390_R14_REGNUM
7b26da
 #define S390_FRAME_REGNUM S390_R11_REGNUM
7b26da
 
7b26da
+#define S390_IS_GREGSET_REGNUM(i)					\
7b26da
+  (((i) >= S390_PSWM_REGNUM && (i) <= S390_A15_REGNUM)			\
7b26da
+   || ((i) >= S390_R0_UPPER_REGNUM && (i) <= S390_R15_UPPER_REGNUM)	\
7b26da
+   || (i) == S390_ORIG_R2_REGNUM)
7b26da
+
7b26da
+#define S390_IS_FPREGSET_REGNUM(i)			\
7b26da
+  ((i) >= S390_FPC_REGNUM && (i) <= S390_F15_REGNUM)
7b26da
+
7b26da
 /* Core file register sets, defined in s390-tdep.c.  */
7b26da
 #define s390_sizeof_gregset 0x90
7b26da
-extern int s390_regmap_gregset[S390_NUM_REGS];
7b26da
+extern const short s390_regmap_gregset[];
7b26da
 #define s390x_sizeof_gregset 0xd8
7b26da
-extern int s390x_regmap_gregset[S390_NUM_REGS];
7b26da
+extern const short s390x_regmap_gregset[];
7b26da
 #define s390_sizeof_fpregset 0x88
7b26da
-extern int s390_regmap_fpregset[S390_NUM_REGS];
7b26da
-extern int s390_regmap_last_break[S390_NUM_REGS];
7b26da
-extern int s390x_regmap_last_break[S390_NUM_REGS];
7b26da
-extern int s390_regmap_system_call[S390_NUM_REGS];
7b26da
+extern const short s390_regmap_fpregset[];
7b26da
+extern const short s390_regmap_last_break[];
7b26da
+extern const short s390x_regmap_last_break[];
7b26da
+extern const short s390_regmap_system_call[];
7b26da
 
7b26da
 /* GNU/Linux target descriptions.  */
7b26da
 extern struct target_desc *tdesc_s390_linux32;