Use htab_t in sim-options.c

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

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 5d018bdb9cd649a94c215b7cad828c85e11dbe9a..8016d0658e321f0b3b4149abe9aef7a3ca628bcf 100644 (file)
--- 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, 2010, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1986-2021 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -48,11 +46,12 @@ sentinel_frame_prev_register (struct frame_info *this_frame,
                              void **this_prologue_cache,
                              int regnum)
 {
-  struct frame_unwind_cache *cache = *this_prologue_cache;
+  struct frame_unwind_cache *cache
+    = (struct frame_unwind_cache *) *this_prologue_cache;
   struct value *value;
 
-  value = regcache_cooked_read_value (cache->regcache, regnum);
-  VALUE_FRAME_ID (value) = get_frame_id (this_frame);
+  value = cache->regcache->cooked_read_value (regnum);
+  VALUE_NEXT_FRAME_ID (value) = sentinel_frame_id;
 
   return value;
 }
@@ -72,9 +71,10 @@ static struct gdbarch *
 sentinel_frame_prev_arch (struct frame_info *this_frame,
                          void **this_prologue_cache)
 {
-  struct frame_unwind_cache *cache = *this_prologue_cache;
+  struct frame_unwind_cache *cache
+    = (struct frame_unwind_cache *) *this_prologue_cache;
 
-  return get_regcache_arch (cache->regcache);
+  return cache->regcache->arch ();
 }
 
 const struct frame_unwind sentinel_frame_unwind =