Turn value_stack and set_value_stack functions into methods

This changes the value_stack and set_value_stack functions to be
methods of value.

Approved-By: Simon Marchi <simon.marchi@efficios.com>

diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index 0274372a0c45ea628d0469c005984787522b2923..292ac8bb559acc306f6977a67f0920cf665c825c 100644 (file)
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -1005,7 +1005,7 @@ dwarf_expr_context::fetch_result (struct type *type, struct type *subobj_type,
            retval = value_at_lazy (subobj_type,
                                    address + subobj_offset);
            if (in_stack_memory)
-             set_value_stack (retval, 1);
+             retval->set_stack (1);
          }
          break;
 

diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index 76601faa4797ae92a51875e53f9f80ab46f47b3a..d3baedb8a6f2b23711be511de92984b31b97c6e5 100644 (file)
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -289,7 +289,7 @@ frame_unwind_got_memory (frame_info_ptr frame, int regnum, CORE_ADDR addr)
   struct gdbarch *gdbarch = frame_unwind_arch (frame);
   struct value *v = value_at_lazy (register_type (gdbarch, regnum), addr);
 
-  set_value_stack (v, 1);
+  v->set_stack (1);
   return v;
 }
 

diff --git a/gdb/valops.c b/gdb/valops.c
index 1823b0bc1d64f9d9d40bca2be318b2053998f5a1..7e3fca30af23dfed49d2c32eedbd8037ae6789e4 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -1376,7 +1376,7 @@ value_repeat (struct value *arg1, int count)
   VALUE_LVAL (val) = lval_memory;
   set_value_address (val, value_address (arg1));
 
-  read_value_memory (val, 0, value_stack (val), value_address (val),
+  read_value_memory (val, 0, val->stack (), value_address (val),
                     value_contents_all_raw (val).data (),
                     type_length_units (val->enclosing_type ()));
 

diff --git a/gdb/value.c b/gdb/value.c
index cb169019028341bf2105ac504fb09201bec0292d..b09ee9bd2d4b292da45d064b253fe4e8493e493d 100644 (file)
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -1291,18 +1291,6 @@ value_contents_copy (struct value *dst, LONGEST dst_offset,
   value_contents_copy_raw (dst, dst_offset, src, src_offset, length);
 }
 
-int
-value_stack (const struct value *value)
-{
-  return value->m_stack;
-}
-
-void
-set_value_stack (struct value *value, int val)
-{
-  value->m_stack = val;
-}
-
 gdb::array_view<const gdb_byte>
 value_contents (struct value *value)
 {
@@ -3886,7 +3874,7 @@ value_fetch_lazy_memory (struct value *val)
   gdb_assert (len >= 0);
 
   if (len > 0)
-    read_value_memory (val, 0, value_stack (val), addr,
+    read_value_memory (val, 0, val->stack (), addr,
                       value_contents_all_raw (val).data (), len);
 }
 

diff --git a/gdb/value.h b/gdb/value.h
index 80946c0a0c99b3ba6b56fabdafc91f193accb52b..73783f8c3a5e7f135002262c90871a9d35f9fefa 100644 (file)
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -295,6 +295,12 @@ struct value
 
   void set_enclosing_type (struct type *new_type);
 
+  int stack () const
+  { return m_stack; }
+
+  void set_stack (int val)
+  { m_stack = val; }
+
 
   /* Type of value; either not an lval, or one of the various
      different possible kinds of lval.  */
@@ -568,9 +574,6 @@ extern const struct lval_funcs *value_computed_funcs (const struct value *);
 
 extern void *value_computed_closure (const struct value *value);
 
-extern int value_stack (const struct value *);
-extern void set_value_stack (struct value *value, int val);
-
 /* Throw an error complaining that the value has been optimized
    out.  */