From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 5B89638618BD; Thu, 14 Dec 2023 16:21:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B89638618BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1702570866; bh=o2S0qLszno1HKvLU7WJ8yFemoNxl/xd6SEhz5IdLYoc=; h=From:To:Subject:Date:From; b=g4lIBDY5VCsHFLAhLrU+C+00Z0cj0qabflgL+vOgwy4MNHtD8j7qyglqmN+4otMAI lc8dqrNWS54m1xMC2zKnOq06j8trDHUwXGlXqUv+fPhcrQ9/nKBLSJhrj7wg5smADz GSqktb/Za3lrW3uwqlwqGn6IJacZF85U4DsGpldI= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: make put_frame_register take an array_view X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: e94d1f726ff6271e826b598301cf3e759793ac1a X-Git-Newrev: f6e3d5577db80e7b43b585f83a383bc6621ae71b Message-Id: <20231214162106.5B89638618BD@sourceware.org> Date: Thu, 14 Dec 2023 16:21:06 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Df6e3d5577db8= 0e7b43b585f83a383bc6621ae71b commit f6e3d5577db80e7b43b585f83a383bc6621ae71b Author: Simon Marchi Date: Fri Dec 1 11:27:20 2023 -0500 gdb: make put_frame_register take an array_view =20 Change put_frame_register to take an array_view instead of a raw pointer. =20 Add an assertion to verify that the number of bytes we try to write matches the length of the register. =20 Change-Id: Ib75a9c8a12b47e203097621643eaa2c1830591ae Reviewed-By: John Baldwin Diff: --- 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 0d3a4955053..eaf2a7e9794 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 =3D register_size (get_frame_arch (frame), regnum); gdb_assert (valtype->length () =3D=3D 4); - gdb_assert (register_size (get_frame_arch (frame), regnum) - <=3D ALPHA_REGISTER_SIZE); - alpha_lds (get_frame_arch (frame), out, in); + gdb_assert (reg_size <=3D ALPHA_REGISTER_SIZE); =20 - put_frame_register (frame, regnum, out); + gdb_byte out[ALPHA_REGISTER_SIZE]; + alpha_lds (get_frame_arch (frame), out, in); + auto out_view =3D gdb::make_array_view (out, reg_size); + put_frame_register (frame, regnum, out_view); } =20 =0C diff --git a/gdb/frame.c b/gdb/frame.c index 08ce2170543..9312d1b4016 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1424,7 +1424,7 @@ read_frame_register_unsigned (frame_info_ptr frame, i= nt regnum, =20 void put_frame_register (frame_info_ptr frame, int regnum, - const gdb_byte *buf) + gdb::array_view buf) { struct gdbarch *gdbarch =3D 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 =3D register_size (gdbarch, regnum); + + gdb_assert (buf.size () =3D=3D size); =20 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 r= egnum, buffer.size ()); =20 if (curr_len =3D=3D 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 r= egnum, =20 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); } =20 diff --git a/gdb/frame.h b/gdb/frame.h index 19bf8176682..4117e169379 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -731,7 +731,7 @@ extern bool read_frame_register_unsigned (frame_info_pt= r 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); =20 /* 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 f425fcbc1b3..85ab87b9f6f 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -3917,7 +3917,8 @@ i386_value_to_register (frame_info_ptr frame, int reg= num, gdb_assert (regnum !=3D -1); gdb_assert (register_size (get_frame_arch (frame), regnum) =3D=3D 4); =20 - put_frame_register (frame, regnum, from); + auto from_view =3D gdb::make_array_view (from, 4); + put_frame_register (frame, regnum, from_view); regnum =3D i386_next_regnum (regnum); len -=3D 4; from +=3D 4; diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c index b9c9e476e93..b39ca2adef5 100644 --- a/gdb/i387-tdep.c +++ b/gdb/i387-tdep.c @@ -397,8 +397,10 @@ i387_value_to_register (frame_info_ptr frame, int regn= um, } =20 /* Convert from TYPE. */ - target_float_convert (from, type, to, i387_ext_type (gdbarch)); - put_frame_register (frame, regnum, to); + struct type *to_type =3D i387_ext_type (gdbarch); + target_float_convert (from, type, to, to_type); + auto to_view =3D gdb::make_array_view (to, to_type->length ()); + put_frame_register (frame, regnum, to_view); } =0C =20 diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c index 6d537c4c8d3..f778c092537 100644 --- a/gdb/ia64-tdep.c +++ b/gdb/ia64-tdep.c @@ -1245,8 +1245,10 @@ ia64_value_to_register (frame_info_ptr frame, int re= gnum, { struct gdbarch *gdbarch =3D 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 =3D ia64_ext_type (gdbarch); + target_float_convert (in, valtype, out, to_type); + auto out_view =3D gdb::make_array_view (out, to_type->length ()); + put_frame_register (frame, regnum, out_view); } =20 =20 diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 0b761d019f2..2e8043af0e0 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -236,8 +236,8 @@ m68k_value_to_register (frame_info_ptr frame, int regnu= m, struct type *type, const gdb_byte *from) { gdb_byte to[M68K_MAX_REGISTER_SIZE]; - struct type *fpreg_type =3D register_type (get_frame_arch (frame), - M68K_FP0_REGNUM); + gdbarch *arch =3D get_frame_arch (frame); + struct type *fpreg_type =3D register_type (arch, M68K_FP0_REGNUM); =20 /* We only support floating-point values. */ if (type->code () !=3D TYPE_CODE_FLT) @@ -249,7 +249,8 @@ m68k_value_to_register (frame_info_ptr frame, int regnu= m, =20 /* Convert from TYPE. */ target_float_convert (from, type, to, fpreg_type); - put_frame_register (frame, regnum, to); + auto to_view =3D gdb::make_array_view (to, fpreg_type->length ()); + put_frame_register (frame, regnum, to_view); } =20 =0C diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index c7157c19e7b..16edfdb0f1b 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -990,8 +990,9 @@ mips_value_to_register (frame_info_ptr frame, int regnu= m, =20 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 =3D 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 16f3da9c011..cbbaf6d83a1 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 =3D ieee_128_float_regnum_adjust (gdbarch, type, regnum); =20 - target_float_convert (from, type, - to, builtin_type (gdbarch)->builtin_double); - put_frame_register (frame, regnum, to); + struct type *to_type =3D builtin_type (gdbarch)->builtin_double; + target_float_convert (from, type, to, to_type); + auto to_view =3D gdb::make_array_view (to, to_type->length ()); + put_frame_register (frame, regnum, to_view); } =20 static struct value *