X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Famd64nbsd-tdep.c;h=94be4d94604f2b473825dc527b13bb90e0d25ea3;hb=8b558f797a3a63aaa8de119ddf53c8afdd1dc6eb;hp=4cecb570390081b22e6d8dd011233067d21b96b2;hpb=a9762ec78a53fbe9209fe1654db42df0cd328d50;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c
index 4cecb57039..94be4d9460 100644
--- a/gdb/amd64nbsd-tdep.c
+++ b/gdb/amd64nbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for NetBSD/amd64.
 
-   Copyright (C) 2003, 2004, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2003-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -24,39 +24,36 @@
 #include "osabi.h"
 #include "symtab.h"
 
-#include "gdb_assert.h"
-
 #include "amd64-tdep.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
 
 /* Support for signal handlers.  */
 
-/* Return whether the frame preceding NEXT_FRAME corresponds to a
-   NetBSD sigtramp routine.  */
+/* Return whether THIS_FRAME corresponds to a NetBSD sigtramp
+   routine.  */
 
 static int
-amd64nbsd_sigtramp_p (struct frame_info *next_frame)
+amd64nbsd_sigtramp_p (struct frame_info *this_frame)
 {
-  CORE_ADDR pc = frame_pc_unwind (next_frame);
-  char *name;
+  CORE_ADDR pc = get_frame_pc (this_frame);
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return nbsd_pc_in_sigtramp (pc, name);
 }
 
-/* Assuming NEXT_FRAME is preceded by a frame corresponding to a
-   NetBSD sigtramp routine, return the address of the associated
-   mcontext structure.  */
+/* Assuming THIS_FRAME corresponds to a NetBSD sigtramp routine,
+   return the address of the associated mcontext structure.  */
 
 static CORE_ADDR
-amd64nbsd_mcontext_addr (struct frame_info *next_frame)
+amd64nbsd_mcontext_addr (struct frame_info *this_frame)
 {
   CORE_ADDR addr;
 
   /* The register %r15 points at `struct ucontext' upon entry of a
      signal trampoline.  */
-  addr = frame_unwind_register_unsigned (next_frame, AMD64_R15_REGNUM);
+  addr = get_frame_register_unsigned (this_frame, AMD64_R15_REGNUM);
 
   /* The mcontext structure lives as offset 56 in `struct ucontext'.  */
   return addr + 56;
@@ -78,7 +75,7 @@ int amd64nbsd_r_reg_offset[] =
   0 * 8,			/* %rdi */
   12 * 8,			/* %rbp */
   24 * 8,			/* %rsp */
-  4 * 8,			/* %r8 .. */
+  4 * 8,			/* %r8 ..  */
   5 * 8,
   6 * 8,
   7 * 8,
@@ -126,7 +123,7 @@ amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 void _initialize_amd64nbsd_tdep (void);
 
 void
-_initialize_amd64nbsd_ndep (void)
+_initialize_amd64nbsd_tdep (void)
 {
   /* The NetBSD/amd64 native dependent code makes this assumption.  */
   gdb_assert (ARRAY_SIZE (amd64nbsd_r_reg_offset) == AMD64_NUM_GREGS);