New regs_info for aarch32

[deliverable/binutils-gdb.git] / gdb / gdbserver / linux-cris-low.c

diff --git a/gdb/gdbserver/linux-cris-low.c b/gdb/gdbserver/linux-cris-low.c
index d331dccd87078208c863ff388b739c403a208e3a..e0bfa1a583b554f303a3508d065a1431cfabc2b9 100644 (file)
--- a/gdb/gdbserver/linux-cris-low.c
+++ b/gdb/gdbserver/linux-cris-low.c
@@ -1,12 +1,11 @@
 /* GNU/Linux/CRIS specific low level interface, for the remote server for GDB.
 /* GNU/Linux/CRIS specific low level interface, for the remote server for GDB.

-   Copyright (C) 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1995-2015 Free Software Foundation, Inc.

 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,13 +14,15 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "server.h"
 #include "linux-low.h"
 
 #include "server.h"
 #include "linux-low.h"

-#include <sys/ptrace.h>
+#include "nat/gdb_ptrace.h"
+
+/* Defined in auto-generated file reg-cris.c.  */
+void init_registers_cris (void);
+extern const struct target_desc *tdesc_cris;

 
 /* CRISv10 */
 #define cris_num_regs 32
 
 /* CRISv10 */
 #define cris_num_regs 32


@@ -37,7 +38,7 @@ static int cris_regmap[] = {
   -1, 17*4, -1, 16*4,
   -1, -1, -1, 18*4,
   -1, 17*4, -1, -1
   -1, 17*4, -1, 16*4,
   -1, -1, -1, 18*4,
   -1, 17*4, -1, -1

-  
+

 };
 
 static int
 };
 
 static int


@@ -45,7 +46,7 @@ cris_cannot_store_register (int regno)
 {
   if (cris_regmap[regno] == -1)
     return 1;
 {
   if (cris_regmap[regno] == -1)
     return 1;

-  
+

   return (regno >= cris_num_regs);
 }
 
   return (regno >= cris_num_regs);
 }
 


@@ -61,20 +62,20 @@ cris_cannot_fetch_register (int regno)
 extern int debug_threads;
 
 static CORE_ADDR
 extern int debug_threads;
 
 static CORE_ADDR

-cris_get_pc (void)
+cris_get_pc (struct regcache *regcache, void)

 {
   unsigned long pc;
 {
   unsigned long pc;

-  collect_register_by_name ("pc", &pc);
+  collect_register_by_name (regcache, "pc", &pc);

   if (debug_threads)
   if (debug_threads)

-    fprintf (stderr, "stop pc is %08lx\n", pc);
+    debug_printf ("stop pc is %08lx\n", pc);

   return pc;
 }
 
 static void
   return pc;
 }
 
 static void

-cris_set_pc (CORE_ADDR pc)
+cris_set_pc (struct regcache *regcache, CORE_ADDR pc)

 {
   unsigned long newpc = pc;
 {
   unsigned long newpc = pc;

-  supply_register_by_name ("pc", &newpc);
+  supply_register_by_name (regcache, "pc", &newpc);

 }
 
 static const unsigned short cris_breakpoint = 0xe938;
 }
 
 static const unsigned short cris_breakpoint = 0xe938;


@@ -101,16 +102,42 @@ cris_breakpoint_at (CORE_ADDR where)
 static CORE_ADDR
 cris_reinsert_addr (void)
 {
 static CORE_ADDR
 cris_reinsert_addr (void)
 {

+  struct regcache *regcache = get_thread_regcache (current_thread, 1);

   unsigned long pc;
   unsigned long pc;

-  collect_register_by_name ("srp", &pc);
+  collect_register_by_name (regcache, "srp", &pc);

   return pc;
 }
 
   return pc;
 }
 

+static void
+cris_arch_setup (void)
+{
+  current_process ()->tdesc = tdesc_cris;
+}
+
+static struct usrregs_info cris_usrregs_info =
+  {
+    cris_num_regs,
+    cris_regmap,
+  };
+
+static struct regs_info regs_info =
+  {
+    NULL, /* regset_bitmap */
+    &cris_usrregs_info,
+  };
+
+static const struct regs_info *
+cris_regs_info (void)
+{
+  return &regs_info;
+}
+

 struct linux_target_ops the_low_target = {
 struct linux_target_ops the_low_target = {

-  cris_num_regs,
-  cris_regmap,
+  cris_arch_setup,
+  cris_regs_info,

   cris_cannot_fetch_register,
   cris_cannot_store_register,
   cris_cannot_fetch_register,
   cris_cannot_store_register,

+  NULL, /* fetch_register */

   cris_get_pc,
   cris_set_pc,
   (const unsigned char *) &cris_breakpoint,
   cris_get_pc,
   cris_set_pc,
   (const unsigned char *) &cris_breakpoint,


@@ -123,3 +150,9 @@ struct linux_target_ops the_low_target = {
   0,
   0,
 };
   0,
   0,
 };

+
+void
+initialize_low_arch (void)
+{
+  init_registers_cris ();
+}