Insert breakpoint even when the raw breakpoint is found

[deliverable/binutils-gdb.git] / gdb / sparc64nbsd-tdep.c

diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c
index 744a5f2894837ed93eb83123a87ee59b2bc1d45d..1abb721e2e01110bdf507ab3b02e3d8e9738db44 100644 (file)
--- a/gdb/sparc64nbsd-tdep.c
+++ b/gdb/sparc64nbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for NetBSD/sparc64.
 
 /* Target-dependent code for NetBSD/sparc64.
 

-   Copyright (C) 2002-2014 Free Software Foundation, Inc.
+   Copyright (C) 2002-2016 Free Software Foundation, Inc.

    Based on code contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.
    Based on code contributed by Wasabi Systems, Inc.
 
    This file is part of GDB.


@@ -30,14 +30,11 @@
 #include "solib-svr4.h"
 #include "trad-frame.h"
 
 #include "solib-svr4.h"
 #include "trad-frame.h"
 

-#include "gdb_assert.h"
-#include <string.h>
-

 #include "sparc64-tdep.h"
 #include "nbsd-tdep.h"
 
 /* From <machine/reg.h>.  */
 #include "sparc64-tdep.h"
 #include "nbsd-tdep.h"
 
 /* From <machine/reg.h>.  */

-const struct sparc_gregset sparc64nbsd_gregset =
+const struct sparc_gregmap sparc64nbsd_gregmap =

 {
   0 * 8,                       /* "tstate" */
   1 * 8,                       /* %pc */
 {
   0 * 8,                       /* "tstate" */
   1 * 8,                       /* %pc */


@@ -56,7 +53,7 @@ sparc64nbsd_supply_gregset (const struct regset *regset,
                            struct regcache *regcache,
                            int regnum, const void *gregs, size_t len)
 {
                            struct regcache *regcache,
                            int regnum, const void *gregs, size_t len)
 {

-  sparc64_supply_gregset (&sparc64nbsd_gregset, regcache, regnum, gregs);
+  sparc64_supply_gregset (&sparc64nbsd_gregmap, regcache, regnum, gregs);

 }
 
 static void
 }
 
 static void


@@ -64,7 +61,7 @@ sparc64nbsd_supply_fpregset (const struct regset *regset,
                             struct regcache *regcache,
                             int regnum, const void *fpregs, size_t len)
 {
                             struct regcache *regcache,
                             int regnum, const void *fpregs, size_t len)
 {

-  sparc64_supply_fpregset (&sparc64_bsd_fpregset, regcache, regnum, fpregs);
+  sparc64_supply_fpregset (&sparc64_bsd_fpregmap, regcache, regnum, fpregs);

 }
 \f
 
 }
 \f
 


@@ -159,7 +156,7 @@ sparc64nbsd_sigcontext_frame_cache (struct frame_info *this_frame,
   CORE_ADDR addr;
 
   if (*this_cache)
   CORE_ADDR addr;
 
   if (*this_cache)

-    return *this_cache;
+    return (struct sparc_frame_cache *) *this_cache;

 
   cache = sparc_frame_cache (this_frame, this_cache);
   gdb_assert (cache == *this_cache);
 
   cache = sparc_frame_cache (this_frame, this_cache);
   gdb_assert (cache == *this_cache);


@@ -219,7 +216,7 @@ sparc64nbsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc64nbsd_pc_in_sigtramp (pc, name))
     {
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (sparc64nbsd_pc_in_sigtramp (pc, name))
     {

-      if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21))
+      if (name == NULL || !startswith (name, "__sigtramp_sigcontext"))

        return 1;
     }
 
        return 1;
     }
 


@@ -237,15 +234,25 @@ static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
 };
 \f
 
 };
 \f
 

+static const struct regset sparc64nbsd_gregset =
+  {
+    NULL, sparc64nbsd_supply_gregset, NULL
+  };
+
+static const struct regset sparc64nbsd_fpregset =
+  {
+    NULL, sparc64nbsd_supply_fpregset, NULL
+  };
+

 static void
 sparc64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
 static void
 sparc64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 

-  tdep->gregset = regset_alloc (gdbarch, sparc64nbsd_supply_gregset, NULL);
+  tdep->gregset = &sparc64nbsd_gregset;

   tdep->sizeof_gregset = 160;
 
   tdep->sizeof_gregset = 160;
 

-  tdep->fpregset = regset_alloc (gdbarch, sparc64nbsd_supply_fpregset, NULL);
+  tdep->fpregset =  &sparc64nbsd_fpregset;

   tdep->sizeof_fpregset = 272;
 
   /* Make sure we can single-step "new" syscalls.  */
   tdep->sizeof_fpregset = 272;
 
   /* Make sure we can single-step "new" syscalls.  */