New gdbserver option --debug-format=timestamp.

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

diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
index 71a037a257efb5fc787b74e36eb934595ddbfb40..a16a656b3d13b647c196a1d21ccbb2cdec78d01a 100644 (file)
--- a/gdb/gdbserver/linux-crisv32-low.c
+++ b/gdb/gdbserver/linux-crisv32-low.c
@@ -1,6 +1,5 @@
 /* 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,
-   2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -23,10 +22,15 @@
 
 /* Defined in auto-generated file reg-crisv32.c.  */
 void init_registers_crisv32 (void);
+extern const struct target_desc *tdesc_crisv32;
 
 /* CRISv32 */
 #define cris_num_regs 49
 
+#ifndef PTRACE_GET_THREAD_AREA
+#define PTRACE_GET_THREAD_AREA 25
+#endif
+
 /* Note: Ignoring USP (having the stack pointer in two locations causes trouble
    without any significant gain).  */
 
@@ -59,7 +63,7 @@ cris_get_pc (struct regcache *regcache)
   unsigned long pc;
   collect_register_by_name (regcache, "pc", &pc);
   if (debug_threads)
-    fprintf (stderr, "stop pc is %08lx\n", pc);
+    debug_printf ("stop pc is %08lx\n", pc);
   return pc;
 }
 
@@ -231,6 +235,7 @@ cris_remove_point (char type, CORE_ADDR addr, int len)
   unsigned long bp_ctrl;
   unsigned long start, end;
   struct regcache *regcache;
+  unsigned long bp_d_regs[12];
 
   /* Breakpoint/watchpoint types:
      0 = memory breakpoint for instructions
@@ -259,8 +264,6 @@ cris_remove_point (char type, CORE_ADDR addr, int len)
      single switch (addr) as there may be several watchpoints with
      the same start address for example.  */
 
-  unsigned long bp_d_regs[12];
-
   /* Get all range registers to simplify search.  */
   collect_register_by_name (regcache, "s3", &bp_d_regs[0]);
   collect_register_by_name (regcache, "s4", &bp_d_regs[1]);
@@ -321,8 +324,9 @@ static int
 cris_stopped_by_watchpoint (void)
 {
   unsigned long exs;
+  struct regcache *regcache = get_thread_regcache (current_inferior, 1);
 
-  collect_register_by_name ("exs", &exs);
+  collect_register_by_name (regcache, "exs", &exs);
 
   return (((exs & 0xff00) >> 8) == 0xc);
 }
@@ -331,51 +335,97 @@ static CORE_ADDR
 cris_stopped_data_address (void)
 {
   unsigned long eda;
+  struct regcache *regcache = get_thread_regcache (current_inferior, 1);
 
-  collect_register_by_name ("eda", &eda);
+  collect_register_by_name (regcache, "eda", &eda);
 
   /* FIXME: Possibly adjust to match watched range.  */
   return eda;
 }
 
+ps_err_e
+ps_get_thread_area (const struct ps_prochandle *ph,
+                    lwpid_t lwpid, int idx, void **base)
+{
+  if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+    return PS_ERR;
+
+  /* IDX is the bias from the thread pointer to the beginning of the
+     thread descriptor.  It has to be subtracted due to implementation
+     quirks in libthread_db.  */
+  *base = (void *) ((char *) *base - idx);
+  return PS_OK;
+}
+
 static void
-cris_fill_gregset (void *buf)
+cris_fill_gregset (struct regcache *regcache, void *buf)
 {
   int i;
 
   for (i = 0; i < cris_num_regs; i++)
     {
       if (cris_regmap[i] != -1)
-       collect_register (i, ((char *) buf) + cris_regmap[i]);
+       collect_register (regcache, i, ((char *) buf) + cris_regmap[i]);
     }
 }
 
 static void
-cris_store_gregset (const void *buf)
+cris_store_gregset (struct regcache *regcache, const void *buf)
 {
   int i;
 
   for (i = 0; i < cris_num_regs; i++)
     {
       if (cris_regmap[i] != -1)
-       supply_register (i, ((char *) buf) + cris_regmap[i]);
+       supply_register (regcache, i, ((char *) buf) + cris_regmap[i]);
     }
 }
 
-typedef unsigned long elf_gregset_t[cris_num_regs];
+static void
+cris_arch_setup (void)
+{
+  current_process ()->tdesc = tdesc_crisv32;
+}
 
-struct regset_info target_regsets[] = {
-  { PTRACE_GETREGS, PTRACE_SETREGS, 0, sizeof (elf_gregset_t),
+static struct regset_info cris_regsets[] = {
+  { PTRACE_GETREGS, PTRACE_SETREGS, 0, cris_num_regs * 4,
     GENERAL_REGS, cris_fill_gregset, cris_store_gregset },
   { 0, 0, 0, -1, -1, NULL, NULL }
 };
 
+
+static struct regsets_info cris_regsets_info =
+  {
+    cris_regsets, /* regsets */
+    0, /* num_regsets */
+    NULL, /* disabled_regsets */
+  };
+
+static struct usrregs_info cris_usrregs_info =
+  {
+    cris_num_regs,
+    cris_regmap,
+  };
+
+static struct regs_info regs_info =
+  {
+    NULL, /* regset_bitmap */
+    &cris_usrregs_info,
+    &cris_regsets_info
+  };
+
+static const struct regs_info *
+cris_regs_info (void)
+{
+  return &regs_info;
+}
+
 struct linux_target_ops the_low_target = {
-  init_register_crisv32,
-  -1,
-  NULL,
+  cris_arch_setup,
+  cris_regs_info,
   NULL,
   NULL,
+  NULL, /* fetch_register */
   cris_get_pc,
   cris_set_pc,
   (const unsigned char *) &cris_breakpoint,
@@ -388,3 +438,11 @@ struct linux_target_ops the_low_target = {
   cris_stopped_by_watchpoint,
   cris_stopped_data_address,
 };
+
+void
+initialize_low_arch (void)
+{
+  init_registers_crisv32 ();
+
+  initialize_regsets_info (&cris_regsets_info);
+}