From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v3 10/50] Turn value_parent into method
Date: Sun, 12 Feb 2023 20:15:26 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v3-10-45e91a20c742@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v3-0-45e91a20c742@tromey.com>
This changes value_parent to be a method of value. Much of this patch
was written by script.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
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, const gdb_byte *valaddr,
/* 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_optimized)
ULONGEST bits_to_skip = 8 * value_offset (v);
if (v->bitsize ())
{
- bits_to_skip += (8 * value_offset (value_parent (v))
+ bits_to_skip += (8 * value_offset (v->parent ())
+ v->bitpos ());
if (from != 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 *fromval)
/* Are we dealing with a bitfield?
- 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)) == NULL);
- offset += value_offset (value_parent (toval));
+ gdb_assert (toval->parent ()->parent () == NULL);
+ offset += value_offset (toval->parent ());
}
set_internalvar_component (VALUE_INTERNALVAR (toval),
@@ -1152,7 +1152,7 @@ value_assign (struct value *toval, struct value *fromval)
if (toval->bitsize ())
{
- struct value *parent = value_parent (toval);
+ struct value *parent = toval->parent ();
changed_addr = value_address (parent) + value_offset (toval);
changed_len = (toval->bitpos ()
@@ -1215,7 +1215,7 @@ value_assign (struct value *toval, struct value *fromval)
if (toval->bitsize ())
{
- struct value *parent = value_parent (toval);
+ struct value *parent = toval->parent ();
LONGEST offset = 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 offset)
value->m_offset = offset;
}
-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 = value_ref_ptr::new_reference (parent);
-}
-
gdb::array_view<gdb_byte>
value_contents_raw (struct value *value)
{
@@ -3064,7 +3050,7 @@ value_primitive_field (struct value *arg1, LONGEST offset,
v->m_offset = (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 = value_parent (val);
+ struct value *parent = val->parent ();
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 = bit; }
+ /* 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 = value_ref_ptr::new_reference (parent); }
+
/* 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 = 0;
};
-/* 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 == lval_memory, this is an offset to the address. If lval
== lval_register, this is a further offset from location.address
--
2.39.1
next prev parent reply other threads:[~2023-02-13 3:16 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 3:15 [PATCH v3 00/50] Use methods for struct value Tom Tromey
2023-02-13 3:15 ` [PATCH v3 01/50] Automatic date update in version.in Tom Tromey
2023-02-13 3:24 ` Tom Tromey
2023-02-13 3:15 ` [PATCH v3 02/50] Rename all fields of struct value Tom Tromey
2023-02-13 3:15 ` [PATCH v3 03/50] Move ~value body out-of-line Tom Tromey
2023-02-13 3:15 ` [PATCH v3 04/50] Move struct value to value.h Tom Tromey
2023-02-13 3:15 ` [PATCH v3 05/50] Turn value_type into method Tom Tromey
2023-02-13 3:15 ` [PATCH v3 06/50] Turn deprecated_set_value_type into a method Tom Tromey
2023-02-13 3:15 ` [PATCH v3 07/50] Turn value_arch into method Tom Tromey
2023-02-13 3:15 ` [PATCH v3 08/50] Turn value_bitsize " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 09/50] Turn value_bitpos " Tom Tromey
2023-02-13 3:15 ` Tom Tromey [this message]
2023-02-13 3:15 ` [PATCH v3 11/50] Turn value_offset " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 12/50] Turn deprecated_value_modifiable " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 13/50] Turn value_enclosing_type " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 14/50] Turn some value offset functions " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 15/50] Turn value_lazy and set_value_lazy functions into methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 16/50] Turn value_stack and set_value_stack " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 17/50] Turn value_computed_closure and value_computed_funcs " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 18/50] Convert value_lval_const and deprecated_lval_hack to methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 19/50] Turn value_initialized and set_value_initialized functions into methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 20/50] Turn value_address and set_value_address " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 21/50] Turn more deprecated_* " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 22/50] Turn allocate_value_lazy into a static "constructor" Tom Tromey
2023-02-13 3:15 ` [PATCH v3 23/50] Turn allocate_value " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 24/50] Turn allocate_computed_value into " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 25/50] Turn allocate_optimized_out_value " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 26/50] Turn value_zero " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 27/50] Turn some value_contents functions into methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 28/50] Turn value_fetch_lazy into a method Tom Tromey
2023-02-13 17:35 ` Simon Marchi
2023-02-13 3:15 ` [PATCH v3 29/50] Turn allocate_value_contents " Tom Tromey
2023-02-13 17:37 ` Simon Marchi
2023-02-13 3:15 ` [PATCH v3 30/50] Turn value_contents_eq " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 31/50] Turn value_bits_synthetic_pointer " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 32/50] Move value_ref_policy methods out-of-line Tom Tromey
2023-02-13 3:15 ` [PATCH v3 33/50] Turn value_incref and value_decref into methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 34/50] Turn remaining value_contents functions " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 35/50] Fully qualify calls to copy in value.c Tom Tromey
2023-02-13 3:15 ` [PATCH v3 36/50] Turn value_copy into a method Tom Tromey
2023-02-13 3:15 ` [PATCH v3 37/50] Turn many optimized-out value functions into methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 38/50] Turn value_non_lval and value_force_lval " Tom Tromey
2023-02-13 3:15 ` [PATCH v3 39/50] Turn set_value_component_location into method Tom Tromey
2023-02-13 3:15 ` [PATCH v3 40/50] Change some code to use value methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 41/50] Turn some xmethod functions into methods Tom Tromey
2023-02-13 3:15 ` [PATCH v3 42/50] Turn preserve_one_value into method Tom Tromey
2023-02-13 3:15 ` [PATCH v3 43/50] Turn various value copying-related functions into methods Tom Tromey
2023-02-13 3:16 ` [PATCH v3 44/50] Add value::set_modifiable Tom Tromey
2023-02-13 3:16 ` [PATCH v3 45/50] Turn record_latest_value into a method Tom Tromey
2023-02-13 17:38 ` Simon Marchi
2023-02-13 3:16 ` [PATCH v3 46/50] Make struct value data members private Tom Tromey
2023-02-13 3:16 ` [PATCH v3 47/50] Make ~value private Tom Tromey
2023-02-13 3:16 ` [PATCH v3 48/50] Introduce set_lval method on value Tom Tromey
2023-02-13 3:16 ` [PATCH v3 49/50] Remove deprecated_lval_hack Tom Tromey
2023-02-13 22:26 ` [PATCH v3 00/50] Use methods for struct value Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230209-submit-value-fixups-2023-v3-10-45e91a20c742@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).