2011-09-02 Pedro Alves <pedro@codesourcery.com>

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

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 4ad3a4b07bddf5fa39255184978e93c99a79805d..5d018bdb9cd649a94c215b7cad828c85e11dbe9a 100644 (file)
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -1,7 +1,7 @@
 /* Code dealing with register stack frames, for GDB, the GNU debugger.
 
    Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2008
+   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -36,6 +36,7 @@ sentinel_frame_cache (struct regcache *regcache)
 {
   struct frame_unwind_cache *cache = 
     FRAME_OBSTACK_ZALLOC (struct frame_unwind_cache);
+
   cache->regcache = regcache;
   return cache;
 }
@@ -47,21 +48,12 @@ sentinel_frame_prev_register (struct frame_info *this_frame,
                              void **this_prologue_cache,
                              int regnum)
 {
-  struct gdbarch *gdbarch = get_frame_arch (this_frame);
   struct frame_unwind_cache *cache = *this_prologue_cache;
   struct value *value;
 
-  /* Return the actual value.  */
-  value = allocate_value (register_type (gdbarch, regnum));
-  VALUE_LVAL (value) = lval_register;
-  VALUE_REGNUM (value) = regnum;
+  value = regcache_cooked_read_value (cache->regcache, regnum);
   VALUE_FRAME_ID (value) = get_frame_id (this_frame);
 
-  /* Use the regcache_cooked_read() method so that it, on the fly,
-     constructs either a raw or pseudo register from the raw
-     register cache.  */
-  regcache_cooked_read (cache->regcache, regnum, value_contents_raw (value));
-
   return value;
 }
 
@@ -76,11 +68,23 @@ sentinel_frame_this_id (struct frame_info *this_frame,
   internal_error (__FILE__, __LINE__, _("sentinel_frame_this_id called"));
 }
 
-const struct frame_unwind sentinel_frame_unwinder =
+static struct gdbarch *
+sentinel_frame_prev_arch (struct frame_info *this_frame,
+                         void **this_prologue_cache)
+{
+  struct frame_unwind_cache *cache = *this_prologue_cache;
+
+  return get_regcache_arch (cache->regcache);
+}
+
+const struct frame_unwind sentinel_frame_unwind =
 {
   SENTINEL_FRAME,
+  default_frame_unwind_stop_reason,
   sentinel_frame_this_id,
-  sentinel_frame_prev_register
+  sentinel_frame_prev_register,
+  NULL,
+  NULL,
+  NULL,
+  sentinel_frame_prev_arch,
 };
-
-const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;