gdb: allow specifying multiple filters when running selftests

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

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index 9d1a81e9facffa5e5699ebd0f4757077d338a503..1d601ca27b2116edadcc0103adc1411ef502d339 100644 (file)
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -1,6 +1,6 @@
 /* Code dealing with register stack frames, for GDB, the GNU debugger.
 
-   Copyright (C) 1986-2002, 2007-2012 Free Software Foundation, Inc.
+   Copyright (C) 1986-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -46,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;
 }
@@ -70,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 =