From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 38/48] Turn set_value_component_location into method
Date: Fri, 10 Feb 2023 14:52:56 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v2-38-b0b27fd97177@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com>
This turns set_value_component_location into a method of value.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/ada-lang.c | 4 ++--
gdb/valarith.c | 2 +-
gdb/valops.c | 2 +-
gdb/value.c | 29 ++++++++++++++---------------
gdb/value.h | 9 ++++-----
5 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 1b0dc2291d0..37aea44b8d5 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -567,7 +567,7 @@ coerce_unspec_val_to_type (struct value *val, struct type *type)
result = value::allocate (type);
value_contents_copy (result, 0, val, 0, type->length ());
}
- set_value_component_location (result, val);
+ result->set_component_location (val);
result->set_bitsize (val->bitsize ());
result->set_bitpos (val->bitpos ());
if (VALUE_LVAL (result) == lval_memory)
@@ -2830,7 +2830,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr,
{
long new_offset = offset;
- set_value_component_location (v, obj);
+ v->set_component_location (obj);
v->set_bitpos (bit_offset + obj->bitpos ());
v->set_bitsize (bit_size);
if (v->bitpos () >= HOST_CHAR_BIT)
diff --git a/gdb/valarith.c b/gdb/valarith.c
index a453eb1f40d..328781ba784 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -94,7 +94,7 @@ value_ptradd (struct value *arg1, LONGEST arg2)
result = value_from_pointer (valptrtype,
value_as_address (arg1) + sz * arg2);
if (VALUE_LVAL (result) != lval_internalvar)
- set_value_component_location (result, arg1);
+ result->set_component_location (arg1);
return result;
}
diff --git a/gdb/valops.c b/gdb/valops.c
index b088a5d99ae..137134abe6c 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -4087,7 +4087,7 @@ value_slice (struct value *array, int lowbound, int length)
type_length_units (slice_type));
}
- set_value_component_location (slice, array);
+ slice->set_component_location (array);
slice->set_offset (array->offset () + offset);
}
diff --git a/gdb/value.c b/gdb/value.c
index 9364913ac31..0d340897f10 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1463,25 +1463,24 @@ value::force_lval (CORE_ADDR addr)
}
void
-set_value_component_location (struct value *component,
- const struct value *whole)
+value::set_component_location (const struct value *whole)
{
struct type *type;
gdb_assert (whole->m_lval != lval_xcallable);
if (whole->m_lval == lval_internalvar)
- VALUE_LVAL (component) = lval_internalvar_component;
+ VALUE_LVAL (this) = lval_internalvar_component;
else
- VALUE_LVAL (component) = whole->m_lval;
+ VALUE_LVAL (this) = whole->m_lval;
- component->m_location = whole->m_location;
+ m_location = whole->m_location;
if (whole->m_lval == lval_computed)
{
const struct lval_funcs *funcs = whole->m_location.computed.funcs;
if (funcs->copy_closure)
- component->m_location.computed.closure = funcs->copy_closure (whole);
+ m_location.computed.closure = funcs->copy_closure (whole);
}
/* If the WHOLE value has a dynamically resolved location property then
@@ -1489,11 +1488,11 @@ set_value_component_location (struct value *component,
type = whole->type ();
if (NULL != TYPE_DATA_LOCATION (type)
&& TYPE_DATA_LOCATION_KIND (type) == PROP_CONST)
- component->set_address (TYPE_DATA_LOCATION_ADDR (type));
+ set_address (TYPE_DATA_LOCATION_ADDR (type));
/* Similarly, if the COMPONENT value has a dynamically resolved location
property then update its address. */
- type = component->type ();
+ type = this->type ();
if (NULL != TYPE_DATA_LOCATION (type)
&& TYPE_DATA_LOCATION_KIND (type) == PROP_CONST)
{
@@ -1514,14 +1513,14 @@ set_value_component_location (struct value *component,
carry around both the parent value contents, and the contents of
any dynamic fields within the parent. This is a substantial
change to how values work in GDB. */
- if (VALUE_LVAL (component) == lval_internalvar_component)
+ if (VALUE_LVAL (this) == lval_internalvar_component)
{
- gdb_assert (component->lazy ());
- VALUE_LVAL (component) = lval_memory;
+ gdb_assert (lazy ());
+ VALUE_LVAL (this) = lval_memory;
}
else
- gdb_assert (VALUE_LVAL (component) == lval_memory);
- component->set_address (TYPE_DATA_LOCATION_ADDR (type));
+ gdb_assert (VALUE_LVAL (this) == lval_memory);
+ set_address (TYPE_DATA_LOCATION_ADDR (type));
}
}
@@ -2824,7 +2823,7 @@ value_primitive_field (struct value *arg1, LONGEST offset,
v->m_offset = (arg1->offset () + offset
+ arg1->embedded_offset ());
}
- set_value_component_location (v, arg1);
+ v->set_component_location (arg1);
return v;
}
@@ -3422,7 +3421,7 @@ value_from_component (struct value *whole, struct type *type, LONGEST offset)
type_length_units (type));
}
v->m_offset = whole->offset () + offset + whole->embedded_offset ();
- set_value_component_location (v, whole);
+ v->set_component_location (whole);
return v;
}
diff --git a/gdb/value.h b/gdb/value.h
index 5c0e3d784aa..8f4636ed6b4 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -538,6 +538,10 @@ struct value
LVAL_MEMORY. */
void force_lval (CORE_ADDR);
+ /* Set this values's location as appropriate for a component of
+ WHOLE --- regardless of what kind of lvalue WHOLE is. */
+ void set_component_location (const struct value *whole);
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -822,11 +826,6 @@ struct lval_funcs
extern void error_value_optimized_out (void);
-/* Set COMPONENT's location as appropriate for a component of WHOLE
- --- regardless of what kind of lvalue WHOLE is. */
-extern void set_value_component_location (struct value *component,
- const struct value *whole);
-
/* While the following fields are per- VALUE .CONTENT .PIECE (i.e., a
single value might have multiple LVALs), this hacked interface is
limited to just the first PIECE. Expect further change. */
--
2.39.1
next prev parent reply other threads:[~2023-02-10 23:21 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-10 21:52 [PATCH v2 00/48] Use methods for struct value Tom Tromey
2023-02-10 21:52 ` [PATCH v2 01/48] Rename all fields of " Tom Tromey
2023-02-11 13:44 ` Simon Marchi
2023-02-13 14:15 ` Tom Tromey
2023-02-10 21:52 ` [PATCH v2 02/48] Move ~value body out-of-line Tom Tromey
2023-02-10 21:52 ` [PATCH v2 03/48] Move struct value to value.h Tom Tromey
2023-02-10 21:52 ` [PATCH v2 04/48] Turn value_type into method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 05/48] Turn deprecated_set_value_type into a method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 06/48] Turn value_arch into method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 07/48] Turn value_bitsize " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 08/48] Turn value_bitpos " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 09/48] Turn value_parent " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 10/48] Turn value_offset " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 11/48] Turn deprecated_value_modifiable " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 12/48] Turn value_enclosing_type " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 13/48] Turn some value offset functions " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 14/48] Turn value_lazy and set_value_lazy functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 15/48] Turn value_stack and set_value_stack " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 16/48] Turn value_computed_closure and value_computed_funcs " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 17/48] Convert value_lval_const and deprecated_lval_hack to methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 18/48] Turn value_initialized and set_value_initialized functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 19/48] Turn value_address and set_value_address " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 20/48] Turn more deprecated_* " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 21/48] Turn allocate_value_lazy into a static "constructor" Tom Tromey
2023-02-10 21:52 ` [PATCH v2 22/48] Turn allocate_value " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 23/48] Turn allocate_computed_value into " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 24/48] Turn allocate_optimized_out_value " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 25/48] Turn value_zero " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 26/48] Turn some value_contents functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 27/48] Turn value_fetch_lazy into a method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 28/48] Turn allocate_value_contents " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 29/48] Turn value_contents_eq " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 30/48] Turn value_bits_synthetic_pointer " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 31/48] Move value_ref_policy methods out-of-line Tom Tromey
2023-02-10 21:52 ` [PATCH v2 32/48] Turn value_incref and value_decref into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 33/48] Turn remaining value_contents functions " Tom Tromey
2023-02-10 21:52 ` [PATCH v2 34/48] Fully qualify calls to copy in value.c Tom Tromey
2023-02-10 21:52 ` [PATCH v2 35/48] Turn value_copy into a method Tom Tromey
2023-02-10 21:52 ` [PATCH v2 36/48] Turn many optimized-out value functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 37/48] Turn value_non_lval and value_force_lval " Tom Tromey
2023-02-10 21:52 ` Tom Tromey [this message]
2023-02-10 21:52 ` [PATCH v2 39/48] Change some code to use value methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 40/48] Turn some xmethod functions into methods Tom Tromey
2023-02-10 21:52 ` [PATCH v2 41/48] Turn preserve_one_value into method Tom Tromey
2023-02-10 21:53 ` [PATCH v2 42/48] Turn various value copying-related functions into methods Tom Tromey
2023-02-11 13:46 ` Simon Marchi
2023-02-12 15:14 ` Tom Tromey
2023-02-10 21:53 ` [PATCH v2 43/48] Add value::set_modifiable Tom Tromey
2023-02-10 21:53 ` [PATCH v2 44/48] Make struct value data members private Tom Tromey
2023-02-10 21:53 ` [PATCH v2 45/48] Make ~value private Tom Tromey
2023-02-10 21:53 ` [PATCH v2 46/48] Introduce set_lval method on value Tom Tromey
2023-02-10 21:53 ` [PATCH v2 47/48] Remove deprecated_lval_hack Tom Tromey
2023-02-10 21:53 ` [PATCH v2 48/48] Rely on value_ref_ptr::operator-> Tom Tromey
2023-02-11 13:40 ` [PATCH v2 00/48] Use methods for struct value Simon Marchi
2023-02-11 13:47 ` Simon Marchi
2023-02-12 4:11 ` 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-v2-38-b0b27fd97177@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).