gdb: testsuite: fix failed testcases in gdb.base/gdb-caching-proc.exp

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

diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index b17bc82850f8033409602af08f071df304817e0d..2e02ad3ca5634dbc8366d2011e210f3e8d36e0a0 100644 (file)
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -1,14 +1,12 @@
 /* Code dealing with register stack frames, for GDB, the GNU debugger.
 
 /* 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-2022 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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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"
 
 
 #include "defs.h"


@@ -38,65 +34,58 @@ sentinel_frame_cache (struct regcache *regcache)
 {
   struct frame_unwind_cache *cache = 
     FRAME_OBSTACK_ZALLOC (struct frame_unwind_cache);
 {
   struct frame_unwind_cache *cache = 
     FRAME_OBSTACK_ZALLOC (struct frame_unwind_cache);

+

   cache->regcache = regcache;
   return cache;
 }
 
 /* Here the register value is taken direct from the register cache.  */
 
   cache->regcache = regcache;
   return cache;
 }
 
 /* Here the register value is taken direct from the register cache.  */
 

-static void
-sentinel_frame_prev_register (struct frame_info *next_frame,
+static struct value *
+sentinel_frame_prev_register (struct frame_info *this_frame,

                              void **this_prologue_cache,
                              void **this_prologue_cache,

-                             int regnum, int *optimized,
-                             enum lval_type *lvalp, CORE_ADDR *addrp,
-                             int *realnum, void *bufferp)
+                             int regnum)

 {
 {

-  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_offset_hack (current_gdbarch, regnum);
-  *realnum = regnum;
-
-  /* If needed, find and return the value of the register.  */
-  if (bufferp != NULL)
-    {
-      /* Return the actual value.  */
-      /* 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, bufferp);
-    }
+  struct frame_unwind_cache *cache
+    = (struct frame_unwind_cache *) *this_prologue_cache;
+  struct value *value;
+
+  value = cache->regcache->cooked_read_value (regnum);
+  VALUE_NEXT_FRAME_ID (value) = sentinel_frame_id;
+
+  return value;

 }
 
 static void
 }
 
 static void

-sentinel_frame_this_id (struct frame_info *next_frame,
+sentinel_frame_this_id (struct frame_info *this_frame,

                        void **this_prologue_cache,
                        struct frame_id *this_id)
 {
   /* 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.  */
                        void **this_prologue_cache,
                        struct frame_id *this_id)
 {
   /* 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");
+  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)
+static struct gdbarch *
+sentinel_frame_prev_arch (struct frame_info *this_frame,
+                         void **this_prologue_cache)

 {
 {

-  struct gdbarch *gdbarch = get_frame_arch (next_frame);
-  return gdbarch_unwind_pc (gdbarch, next_frame);
+  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",

   SENTINEL_FRAME,
   SENTINEL_FRAME,

+  default_frame_unwind_stop_reason,

   sentinel_frame_this_id,
   sentinel_frame_prev_register,
   sentinel_frame_this_id,
   sentinel_frame_prev_register,

-  NULL, /* unwind_data */
-  NULL, /* sniffer */
-  sentinel_frame_prev_pc,
+  NULL,
+  NULL,
+  NULL,
+  sentinel_frame_prev_arch,

 };
 };

-
-const struct frame_unwind *const sentinel_frame_unwind = &sentinel_frame_unwinder;