From: Christian Biesinger <cbiesinger@google.com>
To: Tom Tromey <tom@tromey.com>
Cc: gdb-patches <gdb-patches@sourceware.org>
Subject: Re: [PATCH 19/22] Change two more functions to be methods on die_info
Date: Mon, 23 Mar 2020 14:07:26 -0500 [thread overview]
Message-ID: <CAPTJ0XE8Gw+DjnvCg0u_Oym0XK09iJ5dSfrNUZxLk8FzgUD75Q@mail.gmail.com> (raw)
In-Reply-To: <20200322184523.28959-20-tom@tromey.com>
On Sun, Mar 22, 2020 at 1:46 PM Tom Tromey <tom@tromey.com> wrote:
>
> This changes lookup_addr_base and lookup_ranges_base to be methods on
> die_info.
>
> gdb/ChangeLog
> 2020-03-22 Tom Tromey <tom@tromey.com>
>
> * dwarf2/die.h (struct die_info) <addr_base, ranges_base>: New
> methods.
> * dwarf2/read.c (lookup_addr_base): Move to die.h.
> (lookup_ranges_base): Likewise.
> (read_cutu_die_from_dwo, read_full_die_1): Update.
> ---
> gdb/ChangeLog | 8 ++++++++
> gdb/dwarf2/die.h | 28 ++++++++++++++++++++++++++++
> gdb/dwarf2/read.c | 34 +++-------------------------------
> 3 files changed, 39 insertions(+), 31 deletions(-)
>
> diff --git a/gdb/dwarf2/die.h b/gdb/dwarf2/die.h
> index 3a265b7df03..5673ae261ac 100644
> --- a/gdb/dwarf2/die.h
> +++ b/gdb/dwarf2/die.h
> @@ -33,6 +33,34 @@ struct die_info
> return NULL;
> }
>
> + /* Return the address base of the compile unit, which, if exists, is
> + stored either at the attribute DW_AT_GNU_addr_base, or
> + DW_AT_addr_base. */
> + gdb::optional<ULONGEST> addr_base ()
> + {
> + struct attribute *attr;
> + attr = attr (DW_AT_addr_base);
I get that you want to avoid making code changes while moving code but
I would really suggest merging these two lines at least (similar in
the next function)
> + if (attr == nullptr)
> + attr = attr (DW_AT_GNU_addr_base);
> + if (attr == nullptr)
> + return gdb::optional<ULONGEST> ();
> + return DW_UNSND (attr);
> + }
> +
> + /* Return range lists base of the compile unit, which, if exists, is
> + stored either at the attribute DW_AT_rnglists_base or
> + DW_AT_GNU_ranges_base. */
> + ULONGEST ranges_base ()
> + {
> + struct attribute *attr;
> + attr = attr (DW_AT_rnglists_base);
> + if (attr == nullptr)
> + attr = attr (DW_AT_GNU_ranges_base);
> + if (attr == nullptr)
> + return 0;
> + return DW_UNSND (attr);
> + }
> +
>
> /* DWARF-2 tag for this DIE. */
> ENUM_BITFIELD(dwarf_tag) tag : 16;
> diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
> index 9d744ab0825..9e7152d03e6 100644
> --- a/gdb/dwarf2/read.c
> +++ b/gdb/dwarf2/read.c
> @@ -6386,34 +6386,6 @@ lookup_signatured_type (struct dwarf2_cu *cu, ULONGEST sig)
> }
> }
>
> -/* Return the address base of the compile unit, which, if exists, is stored
> - either at the attribute DW_AT_GNU_addr_base, or DW_AT_addr_base. */
> -static gdb::optional<ULONGEST>
> -lookup_addr_base (struct die_info *comp_unit_die)
> -{
> - struct attribute *attr;
> - attr = comp_unit_die->attr (DW_AT_addr_base);
> - if (attr == nullptr)
> - attr = comp_unit_die->attr (DW_AT_GNU_addr_base);
> - if (attr == nullptr)
> - return gdb::optional<ULONGEST> ();
> - return DW_UNSND (attr);
> -}
> -
> -/* Return range lists base of the compile unit, which, if exists, is stored
> - either at the attribute DW_AT_rnglists_base or DW_AT_GNU_ranges_base. */
> -static ULONGEST
> -lookup_ranges_base (struct die_info *comp_unit_die)
> -{
> - struct attribute *attr;
> - attr = comp_unit_die->attr (DW_AT_rnglists_base);
> - if (attr == nullptr)
> - attr = comp_unit_die->attr (DW_AT_GNU_ranges_base);
> - if (attr == nullptr)
> - return 0;
> - return DW_UNSND (attr);
> -}
> -
> /* Low level DIE reading support. */
>
> /* Initialize a die_reader_specs struct from a dwarf2_cu struct. */
> @@ -6502,12 +6474,12 @@ read_cutu_die_from_dwo (struct dwarf2_per_cu_data *this_cu,
> ranges = dwarf2_attr (stub_comp_unit_die, DW_AT_ranges, cu);
> comp_dir = dwarf2_attr (stub_comp_unit_die, DW_AT_comp_dir, cu);
>
> - cu->addr_base = lookup_addr_base (stub_comp_unit_die);
> + cu->addr_base = stub_comp_unit_die->addr_base ();
>
> /* There should be a DW_AT_rnglists_base (DW_AT_GNU_ranges_base) attribute
> here (if needed). We need the value before we can process
> DW_AT_ranges. */
> - cu->ranges_base = lookup_ranges_base (stub_comp_unit_die);
> + cu->ranges_base = stub_comp_unit_die->ranges_base ();
> }
> else if (stub_comp_dir != NULL)
> {
> @@ -17538,7 +17510,7 @@ read_full_die_1 (const struct die_reader_specs *reader,
> if (attr != nullptr)
> cu->str_offsets_base = DW_UNSND (attr);
>
> - auto maybe_addr_base = lookup_addr_base(die);
> + auto maybe_addr_base = die->addr_base ();
> if (maybe_addr_base.has_value ())
> cu->addr_base = *maybe_addr_base;
> for (int index : indexes_that_need_reprocess)
> --
> 2.17.2
>
next prev parent reply other threads:[~2020-03-23 20:11 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-22 18:45 [PATCH 00/22] More splitting of dwarf2/read.c Tom Tromey
2020-03-22 18:45 ` [PATCH 01/22] Introduce dwarf2/dwz.h Tom Tromey
2020-03-22 18:45 ` [PATCH 02/22] Add dwz.c and dwz_file::read_string Tom Tromey
2020-03-22 18:45 ` [PATCH 03/22] Change dwarf_decode_macro_bytes calling convention Tom Tromey
2020-03-22 18:45 ` [PATCH 04/22] Split dwarf_decode_macros into two overloads Tom Tromey
2020-03-23 16:13 ` Christian Biesinger
2020-03-26 2:09 ` Tom Tromey
2020-03-24 1:58 ` Simon Marchi
2020-03-26 2:10 ` Tom Tromey
2020-03-22 18:45 ` [PATCH 05/22] Move dwarf2_section_buffer_overflow_complaint to dwarf2/section.c Tom Tromey
2020-03-22 18:45 ` [PATCH 06/22] Convert dwarf2_section_buffer_overflow_complaint to a method Tom Tromey
2020-03-22 18:45 ` [PATCH 07/22] Add dwarf2_section_info::read_string method Tom Tromey
2020-03-22 18:45 ` [PATCH 08/22] Move code to new file dwarf2/macro.c Tom Tromey
2020-03-22 18:45 ` [PATCH 09/22] Make some line_header methods const Tom Tromey
2020-03-22 18:45 ` [PATCH 10/22] Use a const line_header in macro reader Tom Tromey
2020-03-22 18:45 ` [PATCH 11/22] Use a const dwarf2_section_info " Tom Tromey
2020-03-22 18:45 ` [PATCH 12/22] Trivial fix in dwarf_decode_macro_bytes Tom Tromey
2020-03-22 18:45 ` [PATCH 13/22] Convert read_indirect_line_string to a method Tom Tromey
2020-03-24 2:49 ` Simon Marchi
2020-03-22 18:45 ` [PATCH 14/22] Move more code to line-header.c Tom Tromey
2020-03-22 18:45 ` [PATCH 15/22] Move die_info to new header Tom Tromey
2020-03-22 18:45 ` [PATCH 16/22] Remove dwarf2_cu::base_known Tom Tromey
2020-03-22 18:45 ` [PATCH 17/22] Change dwarf2_attr_no_follow to be a method Tom Tromey
2020-03-22 18:45 ` [PATCH 18/22] Remove sibling_die Tom Tromey
2020-03-22 18:45 ` [PATCH 19/22] Change two more functions to be methods on die_info Tom Tromey
2020-03-23 19:07 ` Christian Biesinger [this message]
2020-03-26 2:17 ` Tom Tromey
2020-03-22 18:45 ` [PATCH 20/22] Rewrite new die_info methods Tom Tromey
2020-03-22 18:45 ` [PATCH 21/22] Move DWARF-constant stringifying code to new file Tom Tromey
2020-03-22 18:45 ` [PATCH 22/22] Change two functions to be methods on struct attribute Tom Tromey
2020-03-24 13:34 ` [PATCH 00/22] More splitting of dwarf2/read.c Simon Marchi
2020-03-26 15:32 ` 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=CAPTJ0XE8Gw+DjnvCg0u_Oym0XK09iJ5dSfrNUZxLk8FzgUD75Q@mail.gmail.com \
--to=cbiesinger@google.com \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.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