From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH v3 29/50] Turn allocate_value_contents into a method
Date: Sun, 12 Feb 2023 20:15:45 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v3-29-45e91a20c742@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v3-0-45e91a20c742@tromey.com>
This turns the static function allocate_value_contents into a method
on value. It is temporarily public, until some users are converted.
set_limited_array_length is converted as well.
---
gdb/value.c | 52 ++++++++++++++++++++++++----------------------------
gdb/value.h | 13 +++++++++++++
2 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/gdb/value.c b/gdb/value.c
index d1f06174d97..1268e7c46f2 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -901,39 +901,35 @@ calculate_limited_array_length (struct type *array_type)
return len;
}
-/* Try to limit ourselves to only fetching the limited number of
- elements. However, if this limited number of elements still
- puts us over max_value_size, then we still refuse it and
- return failure here, which will ultimately throw an error. */
+/* See value.h. */
-static bool
-set_limited_array_length (struct value *val)
+bool
+value::set_limited_array_length ()
{
- ULONGEST limit = val->m_limited_length;
- ULONGEST len = val->type ()->length ();
+ ULONGEST limit = m_limited_length;
+ ULONGEST len = type ()->length ();
if (array_length_limiting_element_count.has_value ())
- len = calculate_limited_array_length (val->type ());
+ len = calculate_limited_array_length (type ());
if (limit != 0 && len > limit)
len = limit;
if (len > max_value_size)
return false;
- val->m_limited_length = max_value_size;
+ m_limited_length = max_value_size;
return true;
}
-/* Allocate the contents of VAL if it has not been allocated yet.
- If CHECK_SIZE is true, then apply the usual max-value-size checks. */
+/* See value.h. */
-static void
-allocate_value_contents (struct value *val, bool check_size)
+void
+value::allocate_contents (bool check_size)
{
- if (!val->m_contents)
+ if (!m_contents)
{
- struct type *enclosing_type = val->enclosing_type ();
- ULONGEST len = enclosing_type->length ();
+ struct type *enc_type = enclosing_type ();
+ ULONGEST len = enc_type->length ();
if (check_size)
{
@@ -942,16 +938,16 @@ allocate_value_contents (struct value *val, bool check_size)
an element limit in effect, then we can possibly try
to load only a sub-set of the array contents into
GDB's memory. */
- if (val->type () == enclosing_type
- && val->type ()->code () == TYPE_CODE_ARRAY
+ if (type () == enc_type
+ && type ()->code () == TYPE_CODE_ARRAY
&& len > max_value_size
- && set_limited_array_length (val))
- len = val->m_limited_length;
+ && set_limited_array_length ())
+ len = m_limited_length;
else
- check_type_length_before_alloc (enclosing_type);
+ check_type_length_before_alloc (enc_type);
}
- val->m_contents.reset ((gdb_byte *) xzalloc (len));
+ m_contents.reset ((gdb_byte *) xzalloc (len));
}
}
@@ -963,7 +959,7 @@ value::allocate (struct type *type, bool check_size)
{
struct value *val = value::allocate_lazy (type);
- allocate_value_contents (val, check_size);
+ val->allocate_contents (check_size);
val->m_lazy = 0;
return val;
}
@@ -1027,7 +1023,7 @@ value::contents_raw ()
{
int unit_size = gdbarch_addressable_memory_unit_size (arch ());
- allocate_value_contents (this, true);
+ allocate_contents (true);
ULONGEST length = type ()->length ();
return gdb::make_array_view
@@ -1037,7 +1033,7 @@ value::contents_raw ()
gdb::array_view<gdb_byte>
value::contents_all_raw ()
{
- allocate_value_contents (this, true);
+ allocate_contents (true);
ULONGEST length = enclosing_type ()->length ();
return gdb::make_array_view (m_contents.get (), length);
@@ -1574,7 +1570,7 @@ value_copy (const value *arg)
const auto &arg_view
= gdb::make_array_view (arg->m_contents.get (), length);
- allocate_value_contents (val, false);
+ val->allocate_contents (false);
gdb::array_view<gdb_byte> val_contents
= val->contents_all_raw ().slice (0, length);
@@ -3963,7 +3959,7 @@ void
value::fetch_lazy ()
{
gdb_assert (lazy ());
- allocate_value_contents (this, true);
+ allocate_contents (true);
/* A value is either lazy, or fully fetched. The
availability/validity is only established as we try to fetch a
value. */
diff --git a/gdb/value.h b/gdb/value.h
index a7eed4880b4..0b49dea78e9 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -586,6 +586,19 @@ struct value
/* Helper for fetch_lazy when the value is in a register. */
void fetch_lazy_register ();
+
+ /* Try to limit ourselves to only fetching the limited number of
+ elements. However, if this limited number of elements still
+ puts us over max_value_size, then we still refuse it and
+ return failure here, which will ultimately throw an error. */
+ bool set_limited_array_length ();
+
+public: /* Temporary */
+
+ /* Allocate the contents of this value if it has not been allocated
+ yet. If CHECK_SIZE is true, then apply the usual max-value-size
+ checks. */
+ void allocate_contents (bool check_size);
};
/* Returns value_type or value_enclosing_type depending on
--
2.39.1
next prev parent reply other threads:[~2023-02-13 3:15 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 ` [PATCH v3 10/50] Turn value_parent " Tom Tromey
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 ` Tom Tromey [this message]
2023-02-13 17:37 ` [PATCH v3 29/50] Turn allocate_value_contents " 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-29-45e91a20c742@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).