X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fvaxobsd-tdep.c;h=43c48321450f34b1aa0f3591e0510fe8708016ee;hb=d14378154883eb1ae5373e7a73edcc9d97e62634;hp=41a609db9dbfd77a128e9641119186c0353a276f;hpb=cfaf379b3a0cd72305e90badeec34ff59dc8b780;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/vaxobsd-tdep.c b/gdb/vaxobsd-tdep.c
index 41a609db9d..43c4832145 100644
--- a/gdb/vaxobsd-tdep.c
+++ b/gdb/vaxobsd-tdep.c
@@ -1,12 +1,12 @@
 /* Target-dependent code for OpenBSD/vax.
 
-   Copyright 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2014 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,
@@ -15,9 +15,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"
@@ -29,8 +27,6 @@
 
 #include "vax-tdep.h"
 
-#include "gdb_string.h"
-
 /* Signal trampolines.  */
 
 /* Since OpenBSD 3.2, the sigtramp routine is mapped at a random page
@@ -59,20 +55,22 @@ static const gdb_byte vaxobsd_sigreturn[] = {
 };
 
 static int
-vaxobsd_sigtramp_p (struct frame_info *next_frame)
+vaxobsd_sigtramp_sniffer (const struct frame_unwind *self,
+			  struct frame_info *this_frame,
+			  void **this_cache)
 {
-  CORE_ADDR pc = frame_pc_unwind (next_frame);
+  CORE_ADDR pc = get_frame_pc (this_frame);
   CORE_ADDR start_pc = (pc & ~(vaxobsd_page_size - 1));
   CORE_ADDR sigreturn_addr = start_pc + vaxobsd_sigreturn_offset;
   gdb_byte *buf;
-  char *name;
+  const char *name;
 
   find_pc_partial_function (pc, &name, NULL, NULL);
   if (name)
     return 0;
 
   buf = alloca(sizeof vaxobsd_sigreturn);
-  if (!safe_frame_unwind_memory (next_frame, sigreturn_addr,
+  if (!safe_frame_unwind_memory (this_frame, sigreturn_addr,
 				 buf, sizeof vaxobsd_sigreturn))
     return 0;
 
@@ -83,7 +81,7 @@ vaxobsd_sigtramp_p (struct frame_info *next_frame)
 }
 
 static struct trad_frame_cache *
-vaxobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache)
+vaxobsd_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache)
 {
   struct trad_frame_cache *cache;
   CORE_ADDR addr, base, func;
@@ -91,14 +89,14 @@ vaxobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache)
   if (*this_cache)
     return *this_cache;
 
-  cache = trad_frame_cache_zalloc (next_frame);
+  cache = trad_frame_cache_zalloc (this_frame);
   *this_cache = cache;
 
-  func = frame_pc_unwind (next_frame);
+  func = get_frame_pc (this_frame);
   func &= ~(vaxobsd_page_size - 1);
 
-  base = frame_unwind_register_unsigned (next_frame, VAX_SP_REGNUM);
-  addr = get_frame_memory_unsigned (next_frame, base - 4, 4);
+  base = get_frame_register_unsigned (this_frame, VAX_SP_REGNUM);
+  addr = get_frame_memory_unsigned (this_frame, base - 4, 4);
 
   trad_frame_set_reg_addr (cache, VAX_SP_REGNUM, addr + 8);
   trad_frame_set_reg_addr (cache, VAX_FP_REGNUM, addr + 12);
@@ -113,43 +111,33 @@ vaxobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache)
 }
 
 static void
-vaxobsd_sigtramp_frame_this_id (struct frame_info *next_frame,
+vaxobsd_sigtramp_frame_this_id (struct frame_info *this_frame,
 				void **this_cache, struct frame_id *this_id)
 {
   struct trad_frame_cache *cache =
-    vaxobsd_sigtramp_frame_cache (next_frame, this_cache);
+    vaxobsd_sigtramp_frame_cache (this_frame, this_cache);
 
   trad_frame_get_id (cache, this_id);
 }
 
-static void
-vaxobsd_sigtramp_frame_prev_register (struct frame_info *next_frame,
-				      void **this_cache, int regnum,
-				      int *optimizedp, enum lval_type *lvalp,
-				      CORE_ADDR *addrp, int *realnump,
-				      gdb_byte *valuep)
+static struct value *
+vaxobsd_sigtramp_frame_prev_register (struct frame_info *this_frame,
+				      void **this_cache, int regnum)
 {
   struct trad_frame_cache *cache =
-    vaxobsd_sigtramp_frame_cache (next_frame, this_cache);
+    vaxobsd_sigtramp_frame_cache (this_frame, this_cache);
 
-  trad_frame_get_register (cache, next_frame, regnum,
-			   optimizedp, lvalp, addrp, realnump, valuep);
+  return trad_frame_get_register (cache, this_frame, regnum);
 }
 
 static const struct frame_unwind vaxobsd_sigtramp_frame_unwind = {
   SIGTRAMP_FRAME,
+  default_frame_unwind_stop_reason,
   vaxobsd_sigtramp_frame_this_id,
-  vaxobsd_sigtramp_frame_prev_register
+  vaxobsd_sigtramp_frame_prev_register,
+  NULL,
+  vaxobsd_sigtramp_sniffer
 };
-
-static const struct frame_unwind *
-vaxobsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
-{
-  if (vaxobsd_sigtramp_p (next_frame))
-    return &vaxobsd_sigtramp_frame_unwind;
-
-  return NULL;
-}
 
 
 /* OpenBSD a.out.  */
@@ -157,7 +145,7 @@ vaxobsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
 static void
 vaxobsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
-  frame_unwind_append_sniffer (gdbarch, vaxobsd_sigtramp_frame_sniffer);
+  frame_unwind_append_unwinder (gdbarch, &vaxobsd_sigtramp_frame_unwind);
 }
 
 /* FIXME: kettenis/20050821: Since OpenBSD/vax binaries are