X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsentinel-frame.c;h=282e29efca422e642255190db0188d88470d94ff;hb=905eb0e293820ae91941100ebed291a8f74e1f12;hp=e01d19827917a7ab08efb45a06bb162f9b8d6e19;hpb=36f15f554fcea7aedfdcdabcdd19e927b623d615;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index e01d198279..282e29efca 100644
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -1,8 +1,6 @@
 /* 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, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 1986-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -36,6 +34,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,20 +46,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 frame_unwind_cache *cache
+    = (struct frame_unwind_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_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));
+  value = cache->regcache->cooked_read_value (regnum);
+  VALUE_NEXT_FRAME_ID (value) = sentinel_frame_id;
 
   return value;
 }
@@ -80,13 +71,16 @@ 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);
+  struct frame_unwind_cache *cache
+    = (struct frame_unwind_cache *) *this_prologue_cache;
+
+  return cache->regcache->arch ();
 }
 
-const struct frame_unwind sentinel_frame_unwinder =
+const struct frame_unwind sentinel_frame_unwind =
 {
   SENTINEL_FRAME,
+  default_frame_unwind_stop_reason,
   sentinel_frame_this_id,
   sentinel_frame_prev_register,
   NULL,
@@ -94,5 +88,3 @@ const struct frame_unwind sentinel_frame_unwinder =
   NULL,
   sentinel_frame_prev_arch,
 };
-
-const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;