From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 16/47] Turn value_computed_closure and value_computed_funcs functions into methods
Date: Thu, 09 Feb 2023 14:38:37 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v1-16-55dc2794dbb9@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com>
This changes the value_computed_funcs and value_computed_closure
functions to be methods of value.
---
gdb/dwarf2/expr.c | 12 ++++++------
gdb/dwarf2/loc.c | 6 +++---
gdb/opencl-lang.c | 10 +++++-----
gdb/valops.c | 4 ++--
gdb/value.c | 18 +++++++++---------
gdb/value.h | 18 +++++++++---------
6 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index 292ac8bb559..8d845e892e3 100644
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -149,7 +149,7 @@ rw_pieced_value (value *v, value *from, bool check_optimized)
gdb_byte *v_contents;
const gdb_byte *from_contents;
piece_closure *c
- = (piece_closure *) value_computed_closure (v);
+ = (piece_closure *) v->computed_closure ();
gdb::byte_vector buffer;
bool bits_big_endian = type_byte_order (v->type ()) == BFD_ENDIAN_BIG;
@@ -463,7 +463,7 @@ static int
check_pieced_synthetic_pointer (const value *value, LONGEST bit_offset,
int bit_length)
{
- piece_closure *c = (piece_closure *) value_computed_closure (value);
+ piece_closure *c = (piece_closure *) value->computed_closure ();
int i;
bit_offset += 8 * value->offset ();
@@ -503,7 +503,7 @@ static value *
indirect_pieced_value (value *value)
{
piece_closure *c
- = (piece_closure *) value_computed_closure (value);
+ = (piece_closure *) value->computed_closure ();
int i;
dwarf_expr_piece *piece = NULL;
@@ -580,7 +580,7 @@ coerce_pieced_ref (const value *value)
TARGET_CHAR_BIT * type->length ()))
{
const piece_closure *closure
- = (piece_closure *) value_computed_closure (value);
+ = (piece_closure *) value->computed_closure ();
frame_info_ptr frame
= get_selected_frame (_("No frame selected."));
@@ -604,7 +604,7 @@ coerce_pieced_ref (const value *value)
static void *
copy_pieced_value_closure (const value *v)
{
- piece_closure *c = (piece_closure *) value_computed_closure (v);
+ piece_closure *c = (piece_closure *) v->computed_closure ();
++c->refc;
return c;
@@ -613,7 +613,7 @@ copy_pieced_value_closure (const value *v)
static void
free_pieced_value_closure (value *v)
{
- piece_closure *c = (piece_closure *) value_computed_closure (v);
+ piece_closure *c = (piece_closure *) v->computed_closure ();
--c->refc;
if (c->refc == 0)
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index e5b35b8aadb..e975f280cfc 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -1279,7 +1279,7 @@ entry_data_value_coerce_ref (const struct value *value)
if (!TYPE_IS_REFERENCE (checked_type))
return NULL;
- target_val = (struct value *) value_computed_closure (value);
+ target_val = (struct value *) value->computed_closure ();
value_incref (target_val);
return target_val;
}
@@ -1289,7 +1289,7 @@ entry_data_value_coerce_ref (const struct value *value)
static void *
entry_data_value_copy_closure (const struct value *v)
{
- struct value *target_val = (struct value *) value_computed_closure (v);
+ struct value *target_val = (struct value *) v->computed_closure ();
value_incref (target_val);
return target_val;
@@ -1300,7 +1300,7 @@ entry_data_value_copy_closure (const struct value *v)
static void
entry_data_value_free_closure (struct value *v)
{
- struct value *target_val = (struct value *) value_computed_closure (v);
+ struct value *target_val = (struct value *) v->computed_closure ();
value_decref (target_val);
}
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 8c59e823d5c..f7a22b35931 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -119,7 +119,7 @@ allocate_lval_closure (int *indices, int n, struct value *val)
static void
lval_func_read (struct value *v)
{
- struct lval_closure *c = (struct lval_closure *) value_computed_closure (v);
+ struct lval_closure *c = (struct lval_closure *) v->computed_closure ();
struct type *type = check_typedef (v->type ());
struct type *eltype = check_typedef (c->val->type ())->target_type ();
LONGEST offset = v->offset ();
@@ -149,7 +149,7 @@ lval_func_write (struct value *v, struct value *fromval)
{
scoped_value_mark mark;
- struct lval_closure *c = (struct lval_closure *) value_computed_closure (v);
+ struct lval_closure *c = (struct lval_closure *) v->computed_closure ();
struct type *type = check_typedef (v->type ());
struct type *eltype = check_typedef (c->val->type ())->target_type ();
LONGEST offset = v->offset ();
@@ -194,7 +194,7 @@ static int
lval_func_check_synthetic_pointer (const struct value *v,
LONGEST offset, int length)
{
- struct lval_closure *c = (struct lval_closure *) value_computed_closure (v);
+ struct lval_closure *c = (struct lval_closure *) v->computed_closure ();
/* Size of the target type in bits. */
int elsize =
check_typedef (c->val->type ())->target_type ()->length () * 8;
@@ -227,7 +227,7 @@ lval_func_check_synthetic_pointer (const struct value *v,
static void *
lval_func_copy_closure (const struct value *v)
{
- struct lval_closure *c = (struct lval_closure *) value_computed_closure (v);
+ struct lval_closure *c = (struct lval_closure *) v->computed_closure ();
++c->refc;
@@ -237,7 +237,7 @@ lval_func_copy_closure (const struct value *v)
static void
lval_func_free_closure (struct value *v)
{
- struct lval_closure *c = (struct lval_closure *) value_computed_closure (v);
+ struct lval_closure *c = (struct lval_closure *) v->computed_closure ();
--c->refc;
diff --git a/gdb/valops.c b/gdb/valops.c
index b4e67951118..17b96ffcc41 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1273,7 +1273,7 @@ value_assign (struct value *toval, struct value *fromval)
case lval_computed:
{
- const struct lval_funcs *funcs = value_computed_funcs (toval);
+ const struct lval_funcs *funcs = toval->computed_funcs ();
if (funcs->write != NULL)
{
@@ -1639,7 +1639,7 @@ value_ind (struct value *arg1)
if (VALUE_LVAL (arg1) == lval_computed)
{
- const struct lval_funcs *funcs = value_computed_funcs (arg1);
+ const struct lval_funcs *funcs = arg1->computed_funcs ();
if (funcs->indirect)
{
diff --git a/gdb/value.c b/gdb/value.c
index 6607d871fca..495a45d50ba 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1253,19 +1253,19 @@ value_bits_synthetic_pointer (const struct value *value,
}
const struct lval_funcs *
-value_computed_funcs (const struct value *v)
+value::computed_funcs () const
{
- gdb_assert (value_lval_const (v) == lval_computed);
+ gdb_assert (m_lval == lval_computed);
- return v->m_location.computed.funcs;
+ return m_location.computed.funcs;
}
void *
-value_computed_closure (const struct value *v)
+value::computed_closure () const
{
- gdb_assert (v->m_lval == lval_computed);
+ gdb_assert (m_lval == lval_computed);
- return v->m_location.computed.closure;
+ return m_location.computed.closure;
}
enum lval_type *
@@ -3533,7 +3533,7 @@ coerce_ref_if_computed (const struct value *arg)
if (value_lval_const (arg) != lval_computed)
return NULL;
- funcs = value_computed_funcs (arg);
+ funcs = arg->computed_funcs ();
if (funcs->coerce_ref == NULL)
return NULL;
@@ -3848,8 +3848,8 @@ value_fetch_lazy (struct value *val)
else if (VALUE_LVAL (val) == lval_register)
value_fetch_lazy_register (val);
else if (VALUE_LVAL (val) == lval_computed
- && value_computed_funcs (val)->read != NULL)
- value_computed_funcs (val)->read (val);
+ && val->computed_funcs ()->read != NULL)
+ val->computed_funcs ()->read (val);
else
internal_error (_("Unexpected lazy value type."));
diff --git a/gdb/value.h b/gdb/value.h
index 2d311c69efb..8a9406d835b 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -302,6 +302,15 @@ struct value
void set_stack (int val)
{ m_stack = val; }
+ /* If this value is lval_computed, return its lval_funcs
+ structure. */
+ const struct lval_funcs *computed_funcs () const;
+
+ /* If this value is lval_computed, return its closure. The meaning
+ of the returned value depends on the functions this value
+ uses. */
+ void *computed_closure () const;
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -555,15 +564,6 @@ extern struct value *allocate_computed_value (struct type *type,
extern struct value *allocate_optimized_out_value (struct type *type);
-/* If VALUE is lval_computed, return its lval_funcs structure. */
-
-extern const struct lval_funcs *value_computed_funcs (const struct value *);
-
-/* If VALUE is lval_computed, return its closure. The meaning of the
- returned value depends on the functions VALUE uses. */
-
-extern void *value_computed_closure (const struct value *value);
-
/* Throw an error complaining that the value has been optimized
out. */
--
2.39.1
next prev parent reply other threads:[~2023-02-09 21:38 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 21:38 [PATCH 00/47] Use methods for struct value Tom Tromey
2023-02-09 21:38 ` [PATCH 01/47] Rename all fields of " Tom Tromey
2023-02-10 21:05 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 02/47] Move ~value body out-of-line Tom Tromey
2023-02-09 21:38 ` [PATCH 03/47] Move struct value to value.h Tom Tromey
2023-02-09 21:38 ` [PATCH 04/47] Turn value_type into method Tom Tromey
2023-02-09 21:38 ` [PATCH 05/47] Turn deprecated_set_value_type into a method Tom Tromey
2023-02-09 21:38 ` [PATCH 06/47] Turn value_arch into method Tom Tromey
2023-02-10 2:08 ` Simon Marchi
2023-02-10 16:36 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 07/47] Turn value_bitsize " Tom Tromey
2023-02-09 21:38 ` [PATCH 08/47] Turn value_bitpos " Tom Tromey
2023-02-09 21:38 ` [PATCH 09/47] Turn value_parent " Tom Tromey
2023-02-09 21:38 ` [PATCH 10/47] Turn value_offset " Tom Tromey
2023-02-09 21:38 ` [PATCH 11/47] Turn deprecated_value_modifiable " Tom Tromey
2023-02-09 21:38 ` [PATCH 12/47] Turn value_enclosing_type " Tom Tromey
2023-02-09 21:38 ` [PATCH 13/47] Turn some value offset functions " Tom Tromey
2023-02-09 21:38 ` [PATCH 14/47] Turn value_lazy and set_value_lazy functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 15/47] Turn value_stack and set_value_stack " Tom Tromey
2023-02-09 21:38 ` Tom Tromey [this message]
2023-02-09 21:38 ` [PATCH 17/47] Convert value_lval_const and deprecated_lval_hack to methods Tom Tromey
2023-02-09 21:38 ` [PATCH 18/47] Turn value_initialized and set_value_initialized functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 19/47] Turn value_address and set_value_address " Tom Tromey
2023-02-09 21:38 ` [PATCH 20/47] Turn more deprecated_* " Tom Tromey
2023-02-09 21:38 ` [PATCH 21/47] Turn allocate_value_lazy into a static "constructor" Tom Tromey
2023-02-09 21:38 ` [PATCH 22/47] Turn allocate_value " Tom Tromey
2023-02-09 21:38 ` [PATCH 23/47] Turn allocate_computed_value into " Tom Tromey
2023-02-09 21:38 ` [PATCH 24/47] Turn allocate_optimized_out_value " Tom Tromey
2023-02-09 21:38 ` [PATCH 25/47] Turn value_zero " Tom Tromey
2023-02-09 21:38 ` [PATCH 26/47] Turn some value_contents functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 27/47] Turn value_fetch_lazy into a method Tom Tromey
2023-02-09 21:38 ` [PATCH 28/47] Turn allocate_value_contents " Tom Tromey
2023-02-09 21:38 ` [PATCH 29/47] Turn value_contents_eq " Tom Tromey
2023-02-10 2:18 ` Simon Marchi
2023-02-10 17:46 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 30/47] Turn value_bits_synthetic_pointer " Tom Tromey
2023-02-09 21:38 ` [PATCH 31/47] Move value_ref_policy methods out-of-line Tom Tromey
2023-02-09 21:38 ` [PATCH 32/47] Turn value_incref and value_decref into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 33/47] Turn remaining value_contents functions " Tom Tromey
2023-02-10 2:24 ` Simon Marchi
2023-02-10 17:46 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 34/47] Fully qualify calls to copy in value.c Tom Tromey
2023-02-09 21:38 ` [PATCH 35/47] Turn value_copy into a method Tom Tromey
2023-02-10 2:42 ` Simon Marchi
2023-02-10 18:03 ` Tom Tromey
2023-02-09 21:38 ` [PATCH 36/47] Turn many optimized-out value functions into methods Tom Tromey
2023-02-09 21:38 ` [PATCH 37/47] Turn value_non_lval and value_force_lval " Tom Tromey
2023-02-09 21:38 ` [PATCH 38/47] Turn set_value_component_location into method Tom Tromey
2023-02-09 21:39 ` [PATCH 39/47] Change some code to use value methods Tom Tromey
2023-02-09 21:39 ` [PATCH 40/47] Turn some xmethod functions into methods Tom Tromey
2023-02-09 21:39 ` [PATCH 41/47] Turn preserve_one_value into method Tom Tromey
2023-02-09 21:39 ` [PATCH 42/47] Turn various value copying-related functions into methods Tom Tromey
2023-02-10 20:20 ` Tom Tromey
2023-02-09 21:39 ` [PATCH 43/47] Add value::set_modifiable Tom Tromey
2023-02-09 21:39 ` [PATCH 44/47] Make struct value data members private Tom Tromey
2023-02-09 21:39 ` [PATCH 45/47] Make ~value private Tom Tromey
2023-02-09 21:39 ` [PATCH 46/47] Introduce set_lval method on value Tom Tromey
2023-02-09 21:39 ` [PATCH 47/47] Remove deprecated_lval_hack Tom Tromey
2023-02-10 2:54 ` [PATCH 00/47] Use methods for struct value Simon Marchi
2023-02-10 18:08 ` 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-v1-16-55dc2794dbb9@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/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).