From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 7F0183858CDB for ; Fri, 24 Nov 2023 21:29:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7F0183858CDB Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=efficios.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=efficios.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7F0183858CDB Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=158.69.221.121 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700861346; cv=none; b=PxSqRGmgZEVJQ3MDs5rovM6mbFGxwhDJgV65wYTcX5klQ/UNM1BCgr3E9KwCzmY/PCJ0PncoDGuDxncTy3FkvpKxpYNREjJNJ7KbqtxZ5FFALGH/+eu51I1PHPUfk0SOE0zi2LyHXJ/OFIoc05tRpiRlLnwDYE71b0Tsq576DLc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700861346; c=relaxed/simple; bh=nvpDtkSp7abq1A/KEw9hDlzOLmkWSn/Jf4lILXZ3Eds=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=mfaCPT3B6tJX9X+x5WGrOVe6kW+eYFYUdhoAmb89nos6l45jSIRNIx/AJmmKAqCuSeoha/LAF2y2V1oiumAVjeP77ll8PbKFNV0y7xRcIdt3juSgbeZnbd+bsoKBXBZobMJII+s8B0jdQuBEWESE4baG+Dsx8lSUXHnx8Oqziow= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smarchi-efficios.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id B8B731E0D2; Fri, 24 Nov 2023 16:29:03 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Luis Machado , John Baldwin , Andrew Burgess , Simon Marchi , John Baldwin Subject: [PATCH v2 10/24] gdb: make put_frame_register take the next frame Date: Fri, 24 Nov 2023 16:26:27 -0500 Message-ID: <20231124212656.96801-11-simon.marchi@efficios.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231124212656.96801-1-simon.marchi@efficios.com> References: <20231124212656.96801-1-simon.marchi@efficios.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3496.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_SOFTFAIL,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Similar to the previous patches, change put_frame_register to take the "next frame" instead of "this frame". Change-Id: I062fd4663b8f54f0fc7bbf39c860b7341363821b Reviewed-By: John Baldwin --- gdb/alpha-tdep.c | 3 ++- gdb/frame.c | 16 +++++++++------- gdb/frame.h | 8 ++++---- gdb/i386-tdep.c | 3 ++- gdb/i387-tdep.c | 2 +- gdb/ia64-tdep.c | 2 +- gdb/m68k-tdep.c | 2 +- gdb/mips-tdep.c | 5 +++-- gdb/rs6000-tdep.c | 2 +- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 1901b9449e6c..289d6f08782c 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -269,8 +269,9 @@ alpha_value_to_register (frame_info_ptr frame, int regnum, gdb_byte out[ALPHA_REGISTER_SIZE]; alpha_lds (get_frame_arch (frame), out, in); + auto out_view = gdb::make_array_view (out, reg_size); - put_frame_register (frame, regnum, out_view); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, out_view); } diff --git a/gdb/frame.c b/gdb/frame.c index 02c0b23464d3..b908650720de 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1398,10 +1398,10 @@ read_frame_register_unsigned (frame_info_ptr frame, int regnum, } void -put_frame_register (frame_info_ptr frame, int regnum, - gdb::array_view buf) +put_frame_register (frame_info_ptr next_frame, int regnum, + gdb::array_view buf) { - struct gdbarch *gdbarch = get_frame_arch (frame); + gdbarch *gdbarch = frame_unwind_arch (next_frame); int realnum; int optim; int unavail; @@ -1411,8 +1411,8 @@ put_frame_register (frame_info_ptr frame, int regnum, gdb_assert (buf.size () == size); - frame_register_unwind (get_next_frame_sentinel_okay (frame), regnum, &optim, - &unavail, &lval, &addr, &realnum, nullptr); + frame_register_unwind (next_frame, regnum, &optim, &unavail, &lval, &addr, + &realnum, nullptr); if (optim) error (_("Attempt to assign to a register that was not saved.")); switch (lval) @@ -1557,7 +1557,8 @@ put_frame_register_bytes (frame_info_ptr frame, int regnum, buffer.size ()); if (curr_len == register_size (gdbarch, regnum)) - put_frame_register (frame, regnum, buffer.slice (0, curr_len)); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, + buffer.slice (0, curr_len)); else { value *value @@ -1567,7 +1568,8 @@ put_frame_register_bytes (frame_info_ptr frame, int regnum, copy (buffer.slice (0, curr_len), value->contents_writeable ().slice (offset, curr_len)); - put_frame_register (frame, regnum, value->contents_raw ()); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, + value->contents_raw ()); release_value (value); } diff --git a/gdb/frame.h b/gdb/frame.h index 4117e169379a..1d870d619ca5 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -727,10 +727,10 @@ extern ULONGEST get_frame_register_unsigned (frame_info_ptr frame, extern bool read_frame_register_unsigned (frame_info_ptr frame, int regnum, ULONGEST *val); -/* The reverse. Store a register value relative to the specified - frame. Note: this call makes the frame's state undefined. The - register and frame caches must be flushed. */ -extern void put_frame_register (frame_info_ptr frame, int regnum, +/* The reverse. Store a register value relative to NEXT_FRAME's previous frame. + Note: this call makes the frame's state undefined. The register and frame + caches must be flushed. */ +extern void put_frame_register (frame_info_ptr next_frame, int regnum, gdb::array_view buf); /* Read LEN bytes from one or multiple registers starting with REGNUM diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index ddb6cff167c6..cc8276c307b5 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -3918,7 +3918,8 @@ i386_value_to_register (frame_info_ptr frame, int regnum, gdb_assert (register_size (get_frame_arch (frame), regnum) == 4); auto from_view = gdb::make_array_view (from, 4); - put_frame_register (frame, regnum, from_view); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, + from_view); regnum = i386_next_regnum (regnum); len -= 4; from += 4; diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c index 74481f5aeb3c..cfa2a1e297ff 100644 --- a/gdb/i387-tdep.c +++ b/gdb/i387-tdep.c @@ -400,7 +400,7 @@ i387_value_to_register (frame_info_ptr frame, int regnum, struct type *to_type = i387_ext_type (gdbarch); target_float_convert (from, type, to, to_type); auto to_view = gdb::make_array_view (to, to_type->length ()); - put_frame_register (frame, regnum, to_view); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, to_view); } diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index f778c092537b..3bede2644c03 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -1248,7 +1248,7 @@ ia64_value_to_register (frame_info_ptr frame, int regnum, type *to_type = ia64_ext_type (gdbarch); target_float_convert (in, valtype, out, to_type); auto out_view = gdb::make_array_view (out, to_type->length ()); - put_frame_register (frame, regnum, out_view); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, out_view); } diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 5a80ecb94390..bee411f6e61f 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -250,7 +250,7 @@ m68k_value_to_register (frame_info_ptr frame, int regnum, /* Convert from TYPE. */ target_float_convert (from, type, to, fpreg_type); auto to_view = gdb::make_array_view (to, fpreg_type->length ()); - put_frame_register (frame, regnum, to_view); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, to_view); } diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 747fc5fe79a7..878bb4bcbe20 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -991,8 +991,9 @@ mips_value_to_register (frame_info_ptr frame, int regnum, if (mips_convert_register_float_case_p (gdbarch, regnum, type)) { auto from_view = gdb::make_array_view (from, 8); - put_frame_register (frame, regnum, from_view.slice (4)); - put_frame_register (frame, regnum + 1, from_view.slice (0, 4)); + frame_info_ptr next_frame = get_next_frame_sentinel_okay (frame); + put_frame_register (next_frame, regnum, from_view.slice (4)); + put_frame_register (next_frame, regnum + 1, from_view.slice (0, 4)); } else if (mips_convert_register_gpreg_case_p (gdbarch, regnum, type)) { diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 64c0a7054268..4b1a1c27a31f 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2744,7 +2744,7 @@ rs6000_value_to_register (frame_info_ptr frame, struct type *to_type = builtin_type (gdbarch)->builtin_double; target_float_convert (from, type, to, to_type); auto to_view = gdb::make_array_view (to, to_type->length ()); - put_frame_register (frame, regnum, to_view); + put_frame_register (get_next_frame_sentinel_okay (frame), regnum, to_view); } static struct value * -- 2.43.0