2007-10-08 Markus Deuling <deuling@de.ibm.com>

[deliverable/binutils-gdb.git] / gdb / sentinel-frame.c

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 961e0300ea61725da9f7a3b5932f01cd9803131a..4d0c32e94d03b6e0b7081c6fc32d0c7ab82873dc 100644 (file)
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -1,14 +1,14 @@
 /* Code dealing with register stack frames, for GDB, the GNU debugger.
 
-   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
-   1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
-   Foundation, Inc.
+   Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 1999, 2000, 2001, 2002, 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 +17,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"
@@ -44,19 +42,19 @@ sentinel_frame_cache (struct regcache *regcache)
 
 /* Here the register value is taken direct from the register cache.  */
 
-void
-sentinel_frame_register_unwind (struct frame_info *frame,
-                               void **unwind_cache,
-                               int regnum, int *optimized,
-                               enum lval_type *lvalp, CORE_ADDR *addrp,
-                               int *realnum, void *bufferp)
+static void
+sentinel_frame_prev_register (struct frame_info *next_frame,
+                             void **this_prologue_cache,
+                             int regnum, int *optimized,
+                             enum lval_type *lvalp, CORE_ADDR *addrp,
+                             int *realnum, gdb_byte *bufferp)
 {
-  struct frame_unwind_cache *cache = *unwind_cache;
+  struct frame_unwind_cache *cache = *this_prologue_cache;
   /* Describe the register's location.  A reg-frame maps all registers
      onto the corresponding hardware register.  */
   *optimized = 0;
   *lvalp = lval_register;
-  *addrp = REGISTER_BYTE (regnum);
+  *addrp = register_offset_hack (current_gdbarch, regnum);
   *realnum = regnum;
 
   /* If needed, find and return the value of the register.  */
@@ -70,23 +68,33 @@ sentinel_frame_register_unwind (struct frame_info *frame,
     }
 }
 
-void
-sentinel_frame_id_unwind (struct frame_info *frame,
-                         void **cache,
-                         struct frame_id *id)
+static void
+sentinel_frame_this_id (struct frame_info *next_frame,
+                       void **this_prologue_cache,
+                       struct frame_id *this_id)
 {
-  /* FIXME: cagney/2003-01-08: This should be using a per-architecture
-     method that doesn't suffer from DECR_PC_AFTER_BREAK problems.
-     Such a method would take unwind_cache, regcache and stop reason
-     parameters.  */
-  id->base = read_fp ();
-  id->pc = read_pc ();
+  /* The sentinel frame is used as a starting point for creating the
+     previous (inner most) frame.  That frame's THIS_ID method will be
+     called to determine the inner most frame's ID.  Not this one.  */
+  internal_error (__FILE__, __LINE__, _("sentinel_frame_this_id called"));
+}
+
+static CORE_ADDR
+sentinel_frame_prev_pc (struct frame_info *next_frame,
+                       void **this_prologue_cache)
+{
+  struct gdbarch *gdbarch = get_frame_arch (next_frame);
+  return gdbarch_unwind_pc (gdbarch, next_frame);
 }
 
 const struct frame_unwind sentinel_frame_unwinder =
 {
-  sentinel_frame_id_unwind,
-  sentinel_frame_register_unwind
+  SENTINEL_FRAME,
+  sentinel_frame_this_id,
+  sentinel_frame_prev_register,
+  NULL, /* unwind_data */
+  NULL, /* sniffer */
+  sentinel_frame_prev_pc,
 };
 
 const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;