[binutils-gdb] [gdbserver, aarch64] Set usrregs to NULL in regs_info

[Yao Qi <qiyao at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=c2d65f389a2f213d74bd78df6a75dca6eedb3bae

commit c2d65f389a2f213d74bd78df6a75dca6eedb3bae
Author: Yao Qi <yao.qi@linaro.org>
Date:   Thu Jul 9 12:47:06 2015 +0100

    [gdbserver, aarch64] Set usrregs to NULL in regs_info
    
    Hi,
    I happen to read the comments in regs_info below,
    
    struct regs_info
    {
      ...
      /* Info used when accessing registers with PTRACE_PEEKUSER /
         PTRACE_POKEUSER.  This can be NULL if all registers are
         transferred with regsets  .*/
      struct usrregs_info *usrregs;
    
    that usrregs can be NULL if all registers are transferred with
    regsets, which is exactly what aarch64-linux does.  This patch
    is to set usrregs to NULL in regs_info and remove
    aarch64_usrregs_info and aarch64_regmap.
    
    gdb/gdbserver:
    
    2015-07-09  Yao Qi  <yao.qi@linaro.org>
    
    	* linux-aarch64-low.c (aarch64_regmap): Remove.
    	(aarch64_usrregs_info): Remove.
    	(regs_info): Set field usrregs to NULL.

Diff:
---
 gdb/gdbserver/ChangeLog           |  6 ++++++
 gdb/gdbserver/linux-aarch64-low.c | 30 +-----------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 081d305..87c6673 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-09  Yao Qi  <yao.qi@linaro.org>
+
+	* linux-aarch64-low.c (aarch64_regmap): Remove.
+	(aarch64_usrregs_info): Remove.
+	(regs_info): Set field usrregs to NULL.
+
 2015-07-02  Markus Metzger  <markus.t.metzger@intel.com>
 
 	* linux-low.c: Include "rsp-low.h"
diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
index 8a30b00..641b176 100644
--- a/gdb/gdbserver/linux-aarch64-low.c
+++ b/gdb/gdbserver/linux-aarch64-low.c
@@ -51,28 +51,6 @@ extern const struct target_desc *tdesc_aarch64;
 
 #define AARCH64_NUM_REGS (AARCH64_V0_REGNO + AARCH64_V_REGS_NUM + 2)
 
-static int
-aarch64_regmap [] =
-{
-  /* These offsets correspond to GET/SETREGSET */
-  /* x0...  */
-   0*8,  1*8,  2*8,  3*8,  4*8,  5*8,  6*8,  7*8,
-   8*8,  9*8, 10*8, 11*8, 12*8, 13*8, 14*8, 15*8,
-  16*8, 17*8, 18*8, 19*8, 20*8, 21*8, 22*8, 23*8,
-  24*8, 25*8, 26*8, 27*8, 28*8,
-  29*8,
-  30*8,				/* x30 lr */
-  31*8,				/* x31 sp */
-  32*8,				/*     pc */
-  33*8,				/*     cpsr    4 bytes!*/
-
-  /* FP register offsets correspond to GET/SETFPREGSET */
-   0*16,  1*16,  2*16,  3*16,  4*16,  5*16,  6*16,  7*16,
-   8*16,  9*16, 10*16, 11*16, 12*16, 13*16, 14*16, 15*16,
-  16*16, 17*16, 18*16, 19*16, 20*16, 21*16, 22*16, 23*16,
-  24*16, 25*16, 26*16, 27*16, 28*16, 29*16, 30*16, 31*16
-};
-
 /* Here starts the macro definitions, data structures, and code for
    the hardware breakpoint and hardware watchpoint support.  The
    following is the abbreviations that are used frequently in the code
@@ -1285,16 +1263,10 @@ static struct regsets_info aarch64_regsets_info =
     NULL, /* disabled_regsets */
   };
 
-static struct usrregs_info aarch64_usrregs_info =
-  {
-    AARCH64_NUM_REGS,
-    aarch64_regmap,
-  };
-
 static struct regs_info regs_info =
   {
     NULL, /* regset_bitmap */
-    &aarch64_usrregs_info,
+    NULL, /* usrregs */
     &aarch64_regsets_info,
   };