From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 30/48] Turn value_bits_synthetic_pointer into a method
Date: Fri, 10 Feb 2023 14:52:48 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v2-30-b0b27fd97177@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com>
This changes value_bits_synthetic_pointer to be a method of value.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/cp-valprint.c | 6 +++---
gdb/dwarf2/expr.c | 4 ++--
gdb/opencl-lang.c | 5 ++---
gdb/p-valprint.c | 6 +++---
gdb/valops.c | 4 ++--
gdb/valprint.c | 9 ++++-----
gdb/value.c | 12 +++++-------
gdb/value.h | 11 +++++------
8 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index dd396825798..5f18d372aa3 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -270,9 +270,9 @@ cp_print_value_fields (struct value *val, struct ui_file *stream,
fputs_styled ("<optimized out or zero length>",
metadata_style.style (), stream);
}
- else if (value_bits_synthetic_pointer
- (val, type->field (i).loc_bitpos (),
- TYPE_FIELD_BITSIZE (type, i)))
+ else if (val->bits_synthetic_pointer
+ (type->field (i).loc_bitpos (),
+ TYPE_FIELD_BITSIZE (type, i)))
{
fputs_styled (_("<synthetic pointer>"),
metadata_style.style (), stream);
diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index e08dca01a67..ef93b89aaa9 100644
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -576,8 +576,8 @@ coerce_pieced_ref (const value *value)
{
struct type *type = check_typedef (value->type ());
- if (value_bits_synthetic_pointer (value, value->embedded_offset (),
- TARGET_CHAR_BIT * type->length ()))
+ if (value->bits_synthetic_pointer (value->embedded_offset (),
+ TARGET_CHAR_BIT * type->length ()))
{
const piece_closure *closure
= (piece_closure *) value->computed_closure ();
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 8bc727cdfdf..e4a88a23d49 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -215,9 +215,8 @@ lval_func_check_synthetic_pointer (const struct value *v,
int comp_offset = (i == start) ? startrest : 0;
int comp_length = (i == end) ? endrest : elsize;
- if (!value_bits_synthetic_pointer (c->val,
- c->indices[i] * elsize + comp_offset,
- comp_length))
+ if (!c->val->bits_synthetic_pointer (c->indices[i] * elsize + comp_offset,
+ comp_length))
return 0;
}
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index c6b9b5571dd..4b84ec1c43f 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -609,9 +609,9 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream,
fputs_styled ("<optimized out or zero length>",
metadata_style.style (), stream);
}
- else if (value_bits_synthetic_pointer
- (val, type->field (i).loc_bitpos (),
- TYPE_FIELD_BITSIZE (type, i)))
+ else if (val->bits_synthetic_pointer
+ (type->field (i).loc_bitpos (),
+ TYPE_FIELD_BITSIZE (type, i)))
{
fputs_styled (_("<synthetic pointer>"),
metadata_style.style (), stream);
diff --git a/gdb/valops.c b/gdb/valops.c
index 6896478c0f8..fc9c6dcfe64 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1556,8 +1556,8 @@ value_addr (struct value *arg1)
if (TYPE_IS_REFERENCE (type))
{
- if (value_bits_synthetic_pointer (arg1, arg1->embedded_offset (),
- TARGET_CHAR_BIT * type->length ()))
+ if (arg1->bits_synthetic_pointer (arg1->embedded_offset (),
+ TARGET_CHAR_BIT * type->length ()))
arg1 = coerce_ref (arg1);
else
{
diff --git a/gdb/valprint.c b/gdb/valprint.c
index decaaa2710c..d94121edd29 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -381,8 +381,8 @@ valprint_check_validity (struct ui_file *stream,
return 0;
}
- if (value_bits_synthetic_pointer (val, TARGET_CHAR_BIT * embedded_offset,
- TARGET_CHAR_BIT * type->length ()))
+ if (val->bits_synthetic_pointer (TARGET_CHAR_BIT * embedded_offset,
+ TARGET_CHAR_BIT * type->length ()))
{
const int is_ref = type->code () == TYPE_CODE_REF;
int ref_is_addressable = 0;
@@ -568,9 +568,8 @@ generic_val_print_ref (struct type *type,
struct type *elttype = check_typedef (type->target_type ());
struct value *deref_val = NULL;
const int value_is_synthetic
- = value_bits_synthetic_pointer (original_value,
- TARGET_CHAR_BIT * embedded_offset,
- TARGET_CHAR_BIT * type->length ());
+ = original_value->bits_synthetic_pointer (TARGET_CHAR_BIT * embedded_offset,
+ TARGET_CHAR_BIT * type->length ());
const int must_coerce_ref = ((options->addressprint && value_is_synthetic)
|| options->deref_ref);
const int type_is_defined = elttype->code () != TYPE_CODE_UNDEF;
diff --git a/gdb/value.c b/gdb/value.c
index c3fa00a33da..9e5f865b46c 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1236,15 +1236,13 @@ mark_value_bits_optimized_out (struct value *value,
}
int
-value_bits_synthetic_pointer (const struct value *value,
- LONGEST offset, LONGEST length)
+value::bits_synthetic_pointer (LONGEST offset, LONGEST length) const
{
- if (value->m_lval != lval_computed
- || !value->m_location.computed.funcs->check_synthetic_pointer)
+ if (m_lval != lval_computed
+ || !m_location.computed.funcs->check_synthetic_pointer)
return 0;
- return value->m_location.computed.funcs->check_synthetic_pointer (value,
- offset,
- length);
+ return m_location.computed.funcs->check_synthetic_pointer (this, offset,
+ length);
}
const struct lval_funcs *
diff --git a/gdb/value.h b/gdb/value.h
index 162d554e6ff..149e58e29bb 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -454,6 +454,11 @@ struct value
values. */
bool contents_eq (const struct value *val2) const;
+ /* Given a value, determine whether the bits starting at OFFSET and
+ extending for LENGTH bits are a synthetic pointer. */
+
+ int bits_synthetic_pointer (LONGEST offset, LONGEST length) const;
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -826,12 +831,6 @@ extern struct value *coerce_ref (struct value *value);
extern struct value *coerce_array (struct value *value);
-/* Given a value, determine whether the bits starting at OFFSET and
- extending for LENGTH bits are a synthetic pointer. */
-
-extern int value_bits_synthetic_pointer (const struct value *value,
- LONGEST offset, LONGEST length);
-
/* Given a value, determine whether the contents bytes starting at
OFFSET and extending for LENGTH bytes are available. This returns
nonzero if all bytes in the given range are available, zero if any
--
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 ` Tom Tromey [this message]
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 ` [PATCH v2 38/48] Turn set_value_component_location into method Tom Tromey
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-30-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).