From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 6FB553858D1E; Mon, 13 Feb 2023 22:28:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FB553858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1676327315; bh=dOFXR+i9lspc73Q4dO7HMafa+Bz3Hm7o9fGuBVraFII=; h=From:To:Subject:Date:From; b=xjJHYm7SsVgueccuPFaTbAu0KapHfiHV8b5UGa0UEioesIi5JfLRSQxULniLNcpF+ RG432MAhHg0z10mdHQFk9Xc0pTQNh6SAKdg4BEA3et9gnDiD0VJjh6MO/cpxXlRG5z juEXPX5/Pz89zfbMMT4SebJ8GsQzFq1lmZPdOzxY= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Turn value_stack and set_value_stack functions into methods X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 3ee3b2700d59ec1048989a3bf190882740d2ea8b X-Git-Newrev: c8580184bbd1af58769d143b23d254737b08de9d Message-Id: <20230213222835.6FB553858D1E@sourceware.org> Date: Mon, 13 Feb 2023 22:28:35 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dc8580184bbd1= af58769d143b23d254737b08de9d commit c8580184bbd1af58769d143b23d254737b08de9d Author: Tom Tromey Date: Tue Jan 31 11:11:17 2023 -0700 Turn value_stack and set_value_stack functions into methods =20 This changes the value_stack and set_value_stack functions to be methods of value. =20 Approved-By: Simon Marchi Diff: --- gdb/dwarf2/expr.c | 2 +- gdb/frame-unwind.c | 2 +- gdb/valops.c | 2 +- gdb/value.c | 14 +------------- gdb/value.h | 9 ++++++--- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 0274372a0c4..292ac8bb559 100644 --- 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 =3D value_at_lazy (subobj_type, address + subobj_offset); if (in_stack_memory) - set_value_stack (retval, 1); + retval->set_stack (1); } break; =20 diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c index 76601faa479..d3baedb8a6f 100644 --- a/gdb/frame-unwind.c +++ b/gdb/frame-unwind.c @@ -289,7 +289,7 @@ frame_unwind_got_memory (frame_info_ptr frame, int regn= um, CORE_ADDR addr) struct gdbarch *gdbarch =3D frame_unwind_arch (frame); struct value *v =3D value_at_lazy (register_type (gdbarch, regnum), addr= ); =20 - set_value_stack (v, 1); + v->set_stack (1); return v; } =20 diff --git a/gdb/valops.c b/gdb/valops.c index 1823b0bc1d6..7e3fca30af2 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1376,7 +1376,7 @@ value_repeat (struct value *arg1, int count) VALUE_LVAL (val) =3D lval_memory; set_value_address (val, value_address (arg1)); =20 - 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 ())); =20 diff --git a/gdb/value.c b/gdb/value.c index cb169019028..b09ee9bd2d4 100644 --- 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); } =20 -int -value_stack (const struct value *value) -{ - return value->m_stack; -} - -void -set_value_stack (struct value *value, int val) -{ - value->m_stack =3D val; -} - gdb::array_view value_contents (struct value *value) { @@ -3886,7 +3874,7 @@ value_fetch_lazy_memory (struct value *val) gdb_assert (len >=3D 0); =20 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); } =20 diff --git a/gdb/value.h b/gdb/value.h index 80946c0a0c9..73783f8c3a5 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -295,6 +295,12 @@ struct value =20 void set_enclosing_type (struct type *new_type); =20 + int stack () const + { return m_stack; } + + void set_stack (int val) + { m_stack =3D val; } + =20 /* 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 (c= onst struct value *); =20 extern void *value_computed_closure (const struct value *value); =20 -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. */