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(-)
@@ -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);
@@ -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 ())
@@ -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)];
@@ -905,20 +905,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)
{
@@ -2900,7 +2886,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);
}
@@ -3761,7 +3747,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);
@@ -188,6 +188,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. */
@@ -355,13 +364,6 @@ struct value
std::vector<range> m_optimized_out;
};
-/* 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