From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id EC0133858D33; Mon, 13 Feb 2023 22:28:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EC0133858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676327284; bh=Nmju4dhguuSqL2+UqoP3lWMfi40InRJ2oEh/pf/RG5A=; h=From:To:Subject:Date:From; b=S55YPeNzPjagjuab9oNrktCD3PciSg3pQRqC8Sc1l0l2ooxregUMu70ohioVfhQ/v DmpAMsTmk5llM6j1oUJMxc9IUFMPg4ySXOp24NgMtw3DtiE5lbs9KQ+OKddI44c3Kc WklTV3lDOt3tEM0hpKXxYZt2/e5bYk9a4FRU0mXU= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Turn value_parent into method X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 5011c493fb54235b47fbd76e9734072995d93da8 X-Git-Newrev: fac7bdaaab474e2741b88d24781facd9521d0e9c Message-Id: <20230213222804.EC0133858D33@sourceware.org> Date: Mon, 13 Feb 2023 22:28:04 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dfac7bdaaab47= 4e2741b88d24781facd9521d0e9c commit fac7bdaaab474e2741b88d24781facd9521d0e9c Author: Tom Tromey Date: Tue Jan 31 09:56:33 2023 -0700 Turn value_parent into method =20 This changes value_parent to be a method of value. Much of this patch was written by script. =20 Approved-By: Simon Marchi Diff: --- gdb/ada-lang.c | 2 +- gdb/dwarf2/expr.c | 2 +- gdb/valops.c | 10 +++++----- gdb/value.c | 18 ++---------------- gdb/value.h | 16 +++++++++------- 5 files changed, 18 insertions(+), 30 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d1ad9a28ca7..b4fcce21a73 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2842,7 +2842,7 @@ ada_value_primitive_packed_val (struct value *obj, co= nst gdb_byte *valaddr, =20 /* Also set the parent value. This is needed when trying to assign a new value (in inferior memory). */ - set_value_parent (v, obj); + v->set_parent (obj); } else v->set_bitsize (bit_size); diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 826573b628d..2b8feffe881 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -171,7 +171,7 @@ rw_pieced_value (value *v, value *from, bool check_opti= mized) ULONGEST bits_to_skip =3D 8 * value_offset (v); if (v->bitsize ()) { - bits_to_skip +=3D (8 * value_offset (value_parent (v)) + bits_to_skip +=3D (8 * value_offset (v->parent ()) + v->bitpos ()); if (from !=3D nullptr && (type_byte_order (from->type ()) diff --git a/gdb/valops.c b/gdb/valops.c index 45356919185..e522f8466ac 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1125,14 +1125,14 @@ value_assign (struct value *toval, struct value *fr= omval) =20 /* Are we dealing with a bitfield? =20 - It is important to mention that `value_parent (toval)' is + It is important to mention that `toval->parent ()' is non-NULL iff `toval->bitsize ()' is non-zero. */ if (toval->bitsize ()) { /* VALUE_INTERNALVAR below refers to the parent value, while the offset is relative to this parent value. */ - gdb_assert (value_parent (value_parent (toval)) =3D=3D NULL); - offset +=3D value_offset (value_parent (toval)); + gdb_assert (toval->parent ()->parent () =3D=3D NULL); + offset +=3D value_offset (toval->parent ()); } =20 set_internalvar_component (VALUE_INTERNALVAR (toval), @@ -1152,7 +1152,7 @@ value_assign (struct value *toval, struct value *from= val) =20 if (toval->bitsize ()) { - struct value *parent =3D value_parent (toval); + struct value *parent =3D toval->parent (); =20 changed_addr =3D value_address (parent) + value_offset (toval); changed_len =3D (toval->bitpos () @@ -1215,7 +1215,7 @@ value_assign (struct value *toval, struct value *from= val) =20 if (toval->bitsize ()) { - struct value *parent =3D value_parent (toval); + struct value *parent =3D toval->parent (); LONGEST offset =3D value_offset (parent) + value_offset (toval); size_t changed_len; gdb_byte buffer[sizeof (LONGEST)]; diff --git a/gdb/value.c b/gdb/value.c index a51f5ad7773..2a53144b161 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1035,20 +1035,6 @@ set_value_offset (struct value *value, LONGEST offse= t) value->m_offset =3D offset; } =20 -struct value * -value_parent (const struct value *value) -{ - return value->m_parent.get (); -} - -/* See value.h. */ - -void -set_value_parent (struct value *value, struct value *parent) -{ - value->m_parent =3D value_ref_ptr::new_reference (parent); -} - gdb::array_view value_contents_raw (struct value *value) { @@ -3064,7 +3050,7 @@ value_primitive_field (struct value *arg1, LONGEST of= fset, v->m_offset =3D (value_embedded_offset (arg1) + offset + (bitpos - v->m_bitpos) / 8); - set_value_parent (v, arg1); + v->set_parent (arg1); if (!value_lazy (arg1)) value_fetch_lazy (v); } @@ -3925,7 +3911,7 @@ value_fetch_lazy_bitfield (struct value *val) per bitfield. It would be even better to read only the containing word, but we have no way to record that just specific bits of a value have been fetched. */ - struct value *parent =3D value_parent (val); + struct value *parent =3D val->parent (); =20 if (value_lazy (parent)) value_fetch_lazy (parent); diff --git a/gdb/value.h b/gdb/value.h index 7249cdcb5c0..9857c4339bf 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -189,6 +189,15 @@ struct value void set_bitpos (LONGEST bit) { m_bitpos =3D bit; } =20 + /* Only used for bitfields; the containing value. This allows a + single read from the target when displaying multiple + bitfields. */ + value *parent () const + { return m_parent.get (); } + + void set_parent (struct value *parent) + { m_parent =3D value_ref_ptr::new_reference (parent); } + =20 /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -367,13 +376,6 @@ struct value ULONGEST m_limited_length =3D 0; }; =20 -/* Only used for bitfields; the containing value. This allows a - single read from the target when displaying multiple - bitfields. */ - -struct value *value_parent (const struct value *); -extern void set_value_parent (struct value *value, struct value *parent); - /* Describes offset of a value within lval of a structure in bytes. If lval =3D=3D lval_memory, this is an offset to the address. If lval =3D=3D lval_register, this is a further offset from location.address