From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH v2 20/48] Turn more deprecated_* functions into methods
Date: Fri, 10 Feb 2023 14:52:38 -0700 [thread overview]
Message-ID: <20230209-submit-value-fixups-2023-v2-20-b0b27fd97177@tromey.com> (raw)
In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com>
This changes deprecated_value_internalvar_hack,
deprecated_value_internalvar_hack, and deprecated_value_regnum_hack
into methods on value.
Approved-By: Simon Marchi <simon.marchi@efficios.com>
---
gdb/value.c | 18 ++++++------------
gdb/value.h | 16 ++++++++++------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/gdb/value.c b/gdb/value.c
index 19227c11a99..d6465262bab 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1299,24 +1299,18 @@ value::set_address (CORE_ADDR addr)
m_location.address = addr;
}
-struct internalvar **
-deprecated_value_internalvar_hack (struct value *value)
-{
- return &value->m_location.internalvar;
-}
-
struct frame_id *
-deprecated_value_next_frame_id_hack (struct value *value)
+value::deprecated_next_frame_id_hack ()
{
- gdb_assert (value->m_lval == lval_register);
- return &value->m_location.reg.next_frame_id;
+ gdb_assert (m_lval == lval_register);
+ return &m_location.reg.next_frame_id;
}
int *
-deprecated_value_regnum_hack (struct value *value)
+value::deprecated_regnum_hack ()
{
- gdb_assert (value->m_lval == lval_register);
- return &value->m_location.reg.regnum;
+ gdb_assert (m_lval == lval_register);
+ return &m_location.reg.regnum;
}
\f
diff --git a/gdb/value.h b/gdb/value.h
index 07fefea4253..1065f57500d 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -337,6 +337,13 @@ struct value
/* Set the address of a value. */
void set_address (CORE_ADDR);
+ struct internalvar **deprecated_internalvar_hack ()
+ { return &m_location.internalvar; }
+
+ struct frame_id *deprecated_next_frame_id_hack ();
+
+ int *deprecated_regnum_hack ();
+
/* Type of value; either not an lval, or one of the various
different possible kinds of lval. */
@@ -680,19 +687,16 @@ extern void set_value_component_location (struct value *component,
#define VALUE_LVAL(val) (*((val)->deprecated_lval_hack ()))
/* Pointer to internal variable. */
-extern struct internalvar **deprecated_value_internalvar_hack (struct value *);
-#define VALUE_INTERNALVAR(val) (*deprecated_value_internalvar_hack (val))
+#define VALUE_INTERNALVAR(val) (*((val)->deprecated_internalvar_hack ()))
/* Frame ID of "next" frame to which a register value is relative. A
register value is indicated by VALUE_LVAL being set to lval_register.
So, if the register value is found relative to frame F, then the
frame id of F->next will be stored in VALUE_NEXT_FRAME_ID. */
-extern struct frame_id *deprecated_value_next_frame_id_hack (struct value *);
-#define VALUE_NEXT_FRAME_ID(val) (*deprecated_value_next_frame_id_hack (val))
+#define VALUE_NEXT_FRAME_ID(val) (*((val)->deprecated_next_frame_id_hack ()))
/* Register number if the value is from a register. */
-extern int *deprecated_value_regnum_hack (struct value *);
-#define VALUE_REGNUM(val) (*deprecated_value_regnum_hack (val))
+#define VALUE_REGNUM(val) (*((val)->deprecated_regnum_hack ()))
/* Return value after lval_funcs->coerce_ref (after check_typedef). Return
NULL if lval_funcs->coerce_ref is not applicable for whatever reason. */
--
2.39.1
next prev parent reply other threads:[~2023-02-10 21:52 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 ` Tom Tromey [this message]
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 ` [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-20-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).