From patchwork Fri Dec 1 16:27:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 81139 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0A0D3386183E for ; Fri, 1 Dec 2023 16:28:48 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from simark.ca (simark.ca [158.69.221.121]) by sourceware.org (Postfix) with ESMTPS id 321BB385C6E9 for ; Fri, 1 Dec 2023 16:27:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 321BB385C6E9 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 321BB385C6E9 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=1701448078; cv=none; b=VYwCWD/8MPEbWUeHgK/SCRt9zZFPpmJxcYMVHA1C36ePyOeau4eQy9PLLhbFOQCGzEtt43t4+27t/u68yxNExh4CdsOoQZlFQX6zK1j3Mwf6Y4MkG7d+9J0aDlI+Axbb6j2Iwe2wUdZ7kdw2W1plfSzi7zTjNl1N2mWH1IOVaAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701448078; c=relaxed/simple; bh=QdtO7zio5F9mkl/Bt0oSO6mrV7NRszAKmNs9tqTjGMg=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=JQHvxx1Ph+tNzy828h7bUqauCUpFE7h5paSM/LY226FJefD7EZv7Or1QKcHyeYNaMn3knE/D185aJAMQHdOhQuhYaB+b9K6gQAef3715+A/teZpTMn+jWXUDeM2j5Bcy46W1DIZmJ8O1dH+Fs60QfyVDRXUiGiY701ezz+M+v8k= 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 42D411E1A9; Fri, 1 Dec 2023 11:27:55 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Luis Machado , John Baldwin , "Aktemur, Tankut Baris" , Simon Marchi , John Baldwin Subject: [PATCH 07/24] gdb: make put_frame_register take an array_view Date: Fri, 1 Dec 2023 11:27:20 -0500 Message-ID: <20231201162751.741751-8-simon.marchi@efficios.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231201162751.741751-1-simon.marchi@efficios.com> References: <20231201162751.741751-1-simon.marchi@efficios.com> MIME-Version: 1.0 X-Spam-Status: No, score=-3496.7 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Change put_frame_register to take an array_view instead of a raw pointer. Add an assertion to verify that the number of bytes we try to write matches the length of the register. Change-Id: Ib75a9c8a12b47e203097621643eaa2c1830591ae Reviewed-By: John Baldwin --- gdb/alpha-tdep.c | 12 ++++++------ gdb/frame.c | 11 +++++++---- gdb/frame.h | 2 +- gdb/i386-tdep.c | 3 ++- gdb/i387-tdep.c | 6 ++++-- gdb/ia64-tdep.c | 6 ++++-- gdb/m68k-tdep.c | 7 ++++--- gdb/mips-tdep.c | 5 +++-- gdb/rs6000-tdep.c | 7 ++++--- 9 files changed, 35 insertions(+), 24 deletions(-) diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 0d3a49550530..eaf2a7e97949 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -263,14 +263,14 @@ static void alpha_value_to_register (frame_info_ptr frame, int regnum, struct type *valtype, const gdb_byte *in) { - gdb_byte out[ALPHA_REGISTER_SIZE]; - + int reg_size = register_size (get_frame_arch (frame), regnum); gdb_assert (valtype->length () == 4); - gdb_assert (register_size (get_frame_arch (frame), regnum) - <= ALPHA_REGISTER_SIZE); - alpha_lds (get_frame_arch (frame), out, in); + gdb_assert (reg_size <= ALPHA_REGISTER_SIZE); - put_frame_register (frame, regnum, out); + 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); } diff --git a/gdb/frame.c b/gdb/frame.c index 08ce21705432..9312d1b40168 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1424,7 +1424,7 @@ read_frame_register_unsigned (frame_info_ptr frame, int regnum, void put_frame_register (frame_info_ptr frame, int regnum, - const gdb_byte *buf) + gdb::array_view buf) { struct gdbarch *gdbarch = get_frame_arch (frame); int realnum; @@ -1432,6 +1432,9 @@ put_frame_register (frame_info_ptr frame, int regnum, int unavail; enum lval_type lval; CORE_ADDR addr; + int size = register_size (gdbarch, regnum); + + gdb_assert (buf.size () == size); frame_register (frame, regnum, &optim, &unavail, &lval, &addr, &realnum, NULL); @@ -1441,7 +1444,7 @@ put_frame_register (frame_info_ptr frame, int regnum, { case lval_memory: { - write_memory (addr, buf, register_size (gdbarch, regnum)); + write_memory (addr, buf.data (), size); break; } case lval_register: @@ -1577,7 +1580,7 @@ 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.data ()); + put_frame_register (frame, regnum, buffer.slice (0, curr_len)); else { value *value @@ -1587,7 +1590,7 @@ 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 ().data ()); + put_frame_register (frame, regnum, value->contents_raw ()); release_value (value); } diff --git a/gdb/frame.h b/gdb/frame.h index 19bf81766822..4117e169379a 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -731,7 +731,7 @@ extern bool read_frame_register_unsigned (frame_info_ptr frame, 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, - const gdb_byte *buf); + gdb::array_view buf); /* Read LEN bytes from one or multiple registers starting with REGNUM in frame FRAME, starting at OFFSET, into BUF. If the register diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index f356995520fe..3afa902767e5 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -3917,7 +3917,8 @@ i386_value_to_register (frame_info_ptr frame, int regnum, gdb_assert (regnum != -1); gdb_assert (register_size (get_frame_arch (frame), regnum) == 4); - put_frame_register (frame, regnum, from); + auto from_view = gdb::make_array_view (from, 4); + put_frame_register (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 b9c9e476e936..b39ca2adef55 100644 --- a/gdb/i387-tdep.c +++ b/gdb/i387-tdep.c @@ -397,8 +397,10 @@ i387_value_to_register (frame_info_ptr frame, int regnum, } /* Convert from TYPE. */ - target_float_convert (from, type, to, i387_ext_type (gdbarch)); - put_frame_register (frame, regnum, to); + 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); } diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 6d537c4c8d36..f778c092537b 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -1245,8 +1245,10 @@ ia64_value_to_register (frame_info_ptr frame, int regnum, { struct gdbarch *gdbarch = get_frame_arch (frame); gdb_byte out[IA64_FP_REGISTER_SIZE]; - target_float_convert (in, valtype, out, ia64_ext_type (gdbarch)); - put_frame_register (frame, regnum, out); + 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); } diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 0b761d019f2a..2e8043af0e06 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -236,8 +236,8 @@ m68k_value_to_register (frame_info_ptr frame, int regnum, struct type *type, const gdb_byte *from) { gdb_byte to[M68K_MAX_REGISTER_SIZE]; - struct type *fpreg_type = register_type (get_frame_arch (frame), - M68K_FP0_REGNUM); + gdbarch *arch = get_frame_arch (frame); + struct type *fpreg_type = register_type (arch, M68K_FP0_REGNUM); /* We only support floating-point values. */ if (type->code () != TYPE_CODE_FLT) @@ -249,7 +249,8 @@ m68k_value_to_register (frame_info_ptr frame, int regnum, /* Convert from TYPE. */ target_float_convert (from, type, to, fpreg_type); - put_frame_register (frame, regnum, to); + auto to_view = gdb::make_array_view (to, fpreg_type->length ()); + put_frame_register (frame, regnum, to_view); } diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index c7157c19e7be..16edfdb0f1b8 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -990,8 +990,9 @@ mips_value_to_register (frame_info_ptr frame, int regnum, if (mips_convert_register_float_case_p (gdbarch, regnum, type)) { - put_frame_register (frame, regnum + 0, from + 4); - put_frame_register (frame, regnum + 1, from + 0); + 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)); } else if (mips_convert_register_gpreg_case_p (gdbarch, regnum, type)) { diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index 16f3da9c0117..cbbaf6d83a19 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2741,9 +2741,10 @@ rs6000_value_to_register (frame_info_ptr frame, fpr to vsr. */ regnum = ieee_128_float_regnum_adjust (gdbarch, type, regnum); - target_float_convert (from, type, - to, builtin_type (gdbarch)->builtin_double); - put_frame_register (frame, regnum, to); + 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); } static struct value *