diff mbox series

[20/47] Turn more deprecated_* functions into methods

Message ID	20230209-submit-value-fixups-2023-v1-20-55dc2794dbb9@tromey.com
State	Committed
Commit	f29de665046c1b1a2feabf8d3d584b3b89699e10
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3E3403858033 From: Tom Tromey <tom@tromey.com> Date: Thu, 09 Feb 2023 14:38:41 -0700 Subject: [PATCH 20/47] Turn more deprecated_* functions into methods MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20230209-submit-value-fixups-2023-v1-20-55dc2794dbb9@tromey.com> References: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> To: gdb-patches@sourceware.org Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Use methods for struct value \| [00/47] Use methods for struct value [01/47] Rename all fields of struct value [02/47] Move ~value body out-of-line [03/47] Move struct value to value.h [04/47] Turn value_type into method [05/47] Turn deprecated_set_value_type into a method [06/47] Turn value_arch into method [07/47] Turn value_bitsize into method [08/47] Turn value_bitpos into method [09/47] Turn value_parent into method [10/47] Turn value_offset into method [11/47] Turn deprecated_value_modifiable into method [12/47] Turn value_enclosing_type into method [13/47] Turn some value offset functions into method [14/47] Turn value_lazy and set_value_lazy functions into methods [15/47] Turn value_stack and set_value_stack functions into methods [16/47] Turn value_computed_closure and value_computed_funcs functions into methods [17/47] Convert value_lval_const and deprecated_lval_hack to methods [18/47] Turn value_initialized and set_value_initialized functions into methods [19/47] Turn value_address and set_value_address functions into methods [20/47] Turn more deprecated_* functions into methods [21/47] Turn allocate_value_lazy into a static "constructor" [22/47] Turn allocate_value into a static "constructor" [23/47] Turn allocate_computed_value into static "constructor" [24/47] Turn allocate_optimized_out_value into static "constructor" [25/47] Turn value_zero into static "constructor" [26/47] Turn some value_contents functions into methods [27/47] Turn value_fetch_lazy into a method [28/47] Turn allocate_value_contents into a method [29/47] Turn value_contents_eq into a method [30/47] Turn value_bits_synthetic_pointer into a method [31/47] Move value_ref_policy methods out-of-line [32/47] Turn value_incref and value_decref into methods [33/47] Turn remaining value_contents functions into methods [34/47] Fully qualify calls to copy in value.c [35/47] Turn value_copy into a method [36/47] Turn many optimized-out value functions into methods [37/47] Turn value_non_lval and value_force_lval into methods [38/47] Turn set_value_component_location into method [39/47] Change some code to use value methods [40/47] Turn some xmethod functions into methods [41/47] Turn preserve_one_value into method [42/47] Turn various value copying-related functions into methods [43/47] Add value::set_modifiable [44/47] Make struct value data members private [45/47] Make ~value private [46/47] Introduce set_lval method on value [47/47] Remove deprecated_lval_hack

Commit Message

Tom Tromey Feb. 9, 2023, 9:38 p.m. UTC

  This changes deprecated_value_internalvar_hack,
deprecated_value_internalvar_hack, and deprecated_value_regnum_hack
into methods on value.
---
 gdb/value.c | 18 ++++++------------
 gdb/value.h | 16 ++++++++++------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff mbox series

Patch

diff --git a/gdb/value.c b/gdb/value.c
index fa725b1d8af..43543e22f3a 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;
 }
 
 
diff --git a/gdb/value.h b/gdb/value.h
index cc7f85acbf2..03a9259a6fe 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -339,6 +339,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.  */
@@ -682,19 +689,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.  */