gdbserver: fix killed-outside.exp

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

diff --git a/gdb/gdbserver/linux-m32r-low.c b/gdb/gdbserver/linux-m32r-low.c
index 08255e45300560a9ce8bc1a1d5cd76859fc54dc8..bb1002f9db4a2b4e601fc8cf4196f88f30decd90 100644 (file)
--- a/gdb/gdbserver/linux-m32r-low.c
+++ b/gdb/gdbserver/linux-m32r-low.c
@@ -1,5 +1,5 @@
 /* GNU/Linux/m32r specific low level interface, for the remote server for GDB.
-   Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,6 +23,10 @@
 #include <sys/reg.h>
 #endif
 
+/* Defined in auto-generated file reg-m32r.c.  */
+void init_registers_m32r (void);
+extern const struct target_desc *tdesc_m32r;
+
 #define m32r_num_regs 25
 
 static int m32r_regmap[] = {
@@ -50,23 +54,34 @@ m32r_cannot_fetch_register (int regno)
 }
 
 static CORE_ADDR
-m32r_get_pc ()
+m32r_get_pc (struct regcache *regcache)
 {
   unsigned long pc;
-  collect_register_by_name ("pc", &pc);
+  collect_register_by_name (regcache, "pc", &pc);
+  if (debug_threads)
+    debug_printf ("stop pc is %08lx\n", pc);
   return pc;
 }
 
 static void
-m32r_set_pc (CORE_ADDR pc)
+m32r_set_pc (struct regcache *regcache, CORE_ADDR pc)
 {
   unsigned long newpc = pc;
-  supply_register_by_name ("pc", &newpc);
+  supply_register_by_name (regcache, "pc", &newpc);
 }
 
 static const unsigned short m32r_breakpoint = 0x10f1;
 #define m32r_breakpoint_len 2
 
+/* Implementation of linux_target_ops method "sw_breakpoint_from_kind".  */
+
+static const gdb_byte *
+m32r_sw_breakpoint_from_kind (int kind, int *size)
+{
+  *size = m32r_breakpoint_len;
+  return (const gdb_byte *) &m32r_breakpoint;
+}
+
 static int
 m32r_breakpoint_at (CORE_ADDR where)
 {
@@ -82,16 +97,47 @@ m32r_breakpoint_at (CORE_ADDR where)
   return 0;
 }
 
+static void
+m32r_arch_setup (void)
+{
+  current_process ()->tdesc = tdesc_m32r;
+}
+
+static struct usrregs_info m32r_usrregs_info =
+  {
+    m32r_num_regs,
+    m32r_regmap,
+  };
+
+static struct regs_info regs_info =
+  {
+    NULL, /* regset_bitmap */
+    &m32r_usrregs_info,
+  };
+
+static const struct regs_info *
+m32r_regs_info (void)
+{
+  return &regs_info;
+}
+
 struct linux_target_ops the_low_target = {
-  m32r_num_regs,
-  m32r_regmap,
+  m32r_arch_setup,
+  m32r_regs_info,
   m32r_cannot_fetch_register,
   m32r_cannot_store_register,
+  NULL, /* fetch_register */
   m32r_get_pc,
   m32r_set_pc,
-  (const unsigned char *) &m32r_breakpoint,
-  m32r_breakpoint_len,
+  NULL, /* breakpoint_from_pc */
+  m32r_sw_breakpoint_from_kind,
   NULL,
   0,
   m32r_breakpoint_at,
 };
+
+void
+initialize_low_arch (void)
+{
+  init_registers_m32r ();
+}