* python/py-param.c (parm_constants): Avoid ARI warning

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

diff --git a/gdb/amd64nbsd-tdep.c b/gdb/amd64nbsd-tdep.c
index ffa91100e9416955b96c385cfda2147d933cbafd..fb09e55909f47e031e113e4b79a7432f1416a1c2 100644 (file)
--- a/gdb/amd64nbsd-tdep.c
+++ b/gdb/amd64nbsd-tdep.c
@@ -1,12 +1,13 @@
 /* Target-dependent code for NetBSD/amd64.
 
 /* Target-dependent code for NetBSD/amd64.
 

-   Copyright 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2007, 2008, 2009, 2010
+   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,9 +16,7 @@
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "arch-utils.h"
 
 #include "defs.h"
 #include "arch-utils.h"


@@ -34,31 +33,30 @@
 
 /* Support for signal handlers.  */
 
 
 /* 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
 
 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);
+  CORE_ADDR pc = get_frame_pc (this_frame);

   char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return nbsd_pc_in_sigtramp (pc, name);
 }
 
   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
 
 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.  */
 {
   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;
 
   /* The mcontext structure lives as offset 56 in `struct ucontext'.  */
   return addr + 56;


@@ -128,7 +126,7 @@ amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 void _initialize_amd64nbsd_tdep (void);
 
 void
 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);
 {
   /* The NetBSD/amd64 native dependent code makes this assumption.  */
   gdb_assert (ARRAY_SIZE (amd64nbsd_r_reg_offset) == AMD64_NUM_GREGS);