2007-11-12 Markus Deuling <deuling@de.ibm.com>

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

diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c
index 3f19608788f7750464fc9fa9c9674dffca4e57bd..bb711646cc71f15ef290613d1fc4a5a09b5411b0 100644 (file)
--- a/gdb/i386nbsd-tdep.c
+++ b/gdb/i386nbsd-tdep.c
@@ -1,14 +1,13 @@
 /* Target-dependent code for NetBSD/i386.
 
-   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002,
-   2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003,
+   2004, 2007 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
-   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,
@@ -17,9 +16,7 @@
    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"
@@ -132,13 +129,14 @@ static const unsigned char sigtramp_retcode[] =
 };
 
 static LONGEST
-i386nbsd_sigtramp_offset (CORE_ADDR pc)
+i386nbsd_sigtramp_offset (struct frame_info *next_frame)
 {
+  CORE_ADDR pc = frame_pc_unwind (next_frame);
   unsigned char ret[sizeof(sigtramp_retcode)], insn;
   LONGEST off;
   int i;
 
-  if (read_memory_nobpt (pc, &insn, 1) != 0)
+  if (!safe_frame_unwind_memory (next_frame, pc, &insn, 1))
     return -1;
 
   switch (insn)
@@ -150,7 +148,7 @@ i386nbsd_sigtramp_offset (CORE_ADDR pc)
     case RETCODE_INSN2:
       /* INSN2 and INSN3 are the same.  Read at the location of PC+1
         to determine if we're actually looking at INSN2 or INSN3.  */
-      if (read_memory_nobpt (pc + 1, &insn, 1) != 0)
+      if (!safe_frame_unwind_memory (next_frame, pc + 1, &insn, 1))
        return -1;
 
       if (insn == RETCODE_INSN3)
@@ -173,7 +171,7 @@ i386nbsd_sigtramp_offset (CORE_ADDR pc)
 
   pc -= off;
 
-  if (read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0)
+  if (!safe_frame_unwind_memory (next_frame, pc, ret, sizeof (ret)))
     return -1;
 
   if (memcmp (ret, sigtramp_retcode, sizeof (ret)) == 0)
@@ -193,7 +191,7 @@ i386nbsd_sigtramp_p (struct frame_info *next_frame)
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   return (nbsd_pc_in_sigtramp (pc, name)
-         || i386nbsd_sigtramp_offset (pc) >= 0);
+         || i386nbsd_sigtramp_offset (next_frame) >= 0);
 }
 
 /* From <machine/signal.h>.  */
@@ -270,8 +268,6 @@ i386nbsdelf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   i386_elf_init_abi (info, gdbarch);
 
   /* NetBSD ELF uses SVR4-style shared libraries.  */
-  set_gdbarch_in_solib_call_trampoline
-    (gdbarch, generic_in_solib_call_trampoline);
   set_solib_svr4_fetch_link_map_offsets
     (gdbarch, svr4_ilp32_fetch_link_map_offsets);