diff mbox series

[09/24] gdb: remove frame_register

Message ID	20231201162751.741751-10-simon.marchi@efficios.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4C0FB385C407 From: Simon Marchi <simon.marchi@efficios.com> To: gdb-patches@sourceware.org Cc: Luis Machado <luis.machado@arm.com>, John Baldwin <jhb@freebsd.org>, "Aktemur, Tankut Baris" <tankut.baris.aktemur@intel.com>, Simon Marchi <simon.marchi@efficios.com>, John Baldwin <jhb@FreeBSD.org> Subject: [PATCH 09/24] gdb: remove frame_register Date: Fri, 1 Dec 2023 11:27:22 -0500 Message-ID: <20231201162751.741751-10-simon.marchi@efficios.com> In-Reply-To: <20231201162751.741751-1-simon.marchi@efficios.com> References: <20231201162751.741751-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org
Series	Fix reading and writing pseudo registers in non-current frames \| [00/24] Fix reading and writing pseudo registers in non-current frames [01/24] gdb: don't handle i386 k registers as pseudo registers [02/24] gdb: use reg_buffer_common throughout gdbsupport/common-regcache.h [03/24] gdb: make store_integer take an array_view [04/24] gdb: simplify conditions in regcache::{read, write, raw_collect, raw_supply}_part [05/24] gdb: change regcache interface to use array_view [06/24] gdb: fix bugs in {get,put}_frame_register_bytes [07/24] gdb: make put_frame_register take an array_view [08/24] gdb: change value_of_register and value_of_register_lazy to take the next frame [09/24] gdb: remove frame_register [10/24] gdb: make put_frame_register take the next frame [11/24] gdb: make put_frame_register_bytes take the next frame [12/24] gdb: make get_frame_register_bytes take the next frame [13/24] gdb: add value::allocate_register [14/24] gdb: read pseudo register through frame [15/24] gdb: change parameter name in frame_unwind_register_unsigned declaration [16/24] gdb: rename gdbarch_pseudo_register_write to gdbarch_deprecated_pseudo_register_write [17/24] gdb: add gdbarch_pseudo_register_write that takes a frame [18/24] gdb: migrate i386 and amd64 to the new gdbarch_pseudo_register_write [19/24] gdb: make aarch64_za_offsets_from_regnum return za_offsets [20/24] gdb: add missing raw register read in aarch64_sme_pseudo_register_write [21/24] gdb: migrate aarch64 to new gdbarch_pseudo_register_write [22/24] gdb: migrate arm to gdbarch_pseudo_register_read_value [23/24] gdb: migrate arm to new gdbarch_pseudo_register_write [24/24] gdb/testsuite: add tests for unwinding of pseudo registers

Commit Message

Simon Marchi Dec. 1, 2023, 4:27 p.m. UTC

  I was going to change frame_register to take the "next frame", but I
realized that doing so would make it a useless wrapper around
frame_register_unwind.  So, just remove frame_register and replace uses
with frame_register_unwind.

Change-Id: I185868bc69f8e098124775d0550d069220a4678a
Reviewed-By: John Baldwin <jhb@FreeBSD.org>
---
 gdb/frame.c | 39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff mbox series

Patch

diff --git a/gdb/frame.c b/gdb/frame.c
index 9312d1b40168..61d6822ecc1a 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1214,31 +1214,6 @@  frame_register_unwind (frame_info_ptr next_frame, int regnum,
   release_value (value);
 }
 
-/* Get the value of the register that belongs to this FRAME.  This
-   function is a wrapper to the call sequence ``frame_register_unwind
-   (get_next_frame (FRAME))''.  As per frame_register_unwind(), if
-   VALUEP is NULL, the registers value is not fetched/computed.  */
-
-static void
-frame_register (frame_info_ptr frame, int regnum,
-		int *optimizedp, int *unavailablep, enum lval_type *lvalp,
-		CORE_ADDR *addrp, int *realnump, gdb_byte *bufferp)
-{
-  /* Require all but BUFFERP to be valid.  A NULL BUFFERP indicates
-     that the value proper does not need to be fetched.  */
-  gdb_assert (optimizedp != NULL);
-  gdb_assert (lvalp != NULL);
-  gdb_assert (addrp != NULL);
-  gdb_assert (realnump != NULL);
-  /* gdb_assert (bufferp != NULL); */
-
-  /* Obtain the register value by unwinding the register from the next
-     (more inner frame).  */
-  gdb_assert (frame != NULL && frame->next != NULL);
-  frame_register_unwind (frame_info_ptr (frame->next), regnum, optimizedp,
-			 unavailablep, lvalp, addrp, realnump, bufferp);
-}
-
 void
 frame_unwind_register (frame_info_ptr next_frame, int regnum, gdb_byte *buf)
 {
@@ -1436,8 +1411,8 @@  put_frame_register (frame_info_ptr frame, int regnum,
 
   gdb_assert (buf.size () == size);
 
-  frame_register (frame, regnum, &optim, &unavail,
-		  &lval, &addr, &realnum, NULL);
+  frame_register_unwind (get_next_frame_sentinel_okay (frame), regnum, &optim,
+			 &unavail, &lval, &addr, &realnum, nullptr);
   if (optim)
     error (_("Attempt to assign to a register that was not saved."));
   switch (lval)
@@ -1473,8 +1448,9 @@  deprecated_frame_register_read (frame_info_ptr frame, int regnum,
   CORE_ADDR addr;
   int realnum;
 
-  frame_register (frame, regnum, &optimized, &unavailable,
-		  &lval, &addr, &realnum, myaddr);
+  frame_register_unwind (get_next_frame_sentinel_okay (frame), regnum,
+			 &optimized, &unavailable, &lval, &addr, &realnum,
+			 myaddr);
 
   return !optimized && !unavailable;
 }
@@ -1523,8 +1499,9 @@  get_frame_register_bytes (frame_info_ptr frame, int regnum,
 	  CORE_ADDR addr;
 	  int realnum;
 
-	  frame_register (frame, regnum, optimizedp, unavailablep, &lval,
-			  &addr, &realnum, buffer.data ());
+	  frame_register_unwind (get_next_frame_sentinel_okay (frame), regnum,
+				 optimizedp, unavailablep, &lval, &addr,
+				 &realnum, buffer.data ());
 	  if (*optimizedp || *unavailablep)
 	    return false;
 	}