From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 04/30] Refactor dwarf2_get_pc_bounds
Date: Wed, 25 Aug 2021 20:19:11 -0600 [thread overview]
Message-ID: <20210826021937.1490292-5-tom@tromey.com> (raw)
In-Reply-To: <20210826021937.1490292-1-tom@tromey.com>
This changes dwarf2_get_pc_bounds so that it does not directly access
a psymtab or psymtabs_addrmap. Instead, both the addrmap and the
desired payload are passed as parameters. This makes it suitable to
be used by the new indexer.
---
gdb/dwarf2/read.c | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index a772a16c64c..1186cca6055 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -1284,7 +1284,8 @@ enum pc_bounds_kind
static enum pc_bounds_kind dwarf2_get_pc_bounds (struct die_info *,
CORE_ADDR *, CORE_ADDR *,
struct dwarf2_cu *,
- dwarf2_psymtab *);
+ addrmap *,
+ void *);
static void get_scope_pc_bounds (struct die_info *,
CORE_ADDR *, CORE_ADDR *,
@@ -7024,8 +7025,11 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
/* Possibly set the default values of LOWPC and HIGHPC from
`DW_AT_ranges'. */
- cu_bounds_kind = dwarf2_get_pc_bounds (comp_unit_die, &best_lowpc,
- &best_highpc, cu, pst);
+ cu_bounds_kind
+ = dwarf2_get_pc_bounds (comp_unit_die, &best_lowpc,
+ &best_highpc, cu,
+ per_bfd->partial_symtabs->psymtabs_addrmap,
+ pst);
if (cu_bounds_kind == PC_BOUNDS_HIGH_LOW && best_lowpc < best_highpc)
{
CORE_ADDR low
@@ -13082,7 +13086,7 @@ read_func_scope (struct die_info *die, struct dwarf2_cu *cu)
}
/* Ignore functions with missing or invalid low and high pc attributes. */
- if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL)
+ if (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr)
<= PC_BOUNDS_INVALID)
{
attr = dwarf2_attr (die, DW_AT_external, cu);
@@ -13255,7 +13259,7 @@ read_lexical_block_scope (struct die_info *die, struct dwarf2_cu *cu)
as multiple lexical blocks? Handling children in a sane way would
be nasty. Might be easier to properly extend generic blocks to
describe ranges. */
- switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, NULL))
+ switch (dwarf2_get_pc_bounds (die, &lowpc, &highpc, cu, nullptr, nullptr))
{
case PC_BOUNDS_NOT_PRESENT:
/* DW_TAG_lexical_block has no attributes, process its children as if
@@ -13496,7 +13500,8 @@ read_call_site_scope (struct die_info *die, struct dwarf2_cu *cu)
CORE_ADDR lowpc;
/* DW_AT_entry_pc should be preferred. */
- if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu, NULL)
+ if (dwarf2_get_pc_bounds (target_die, &lowpc, NULL, target_cu,
+ nullptr, nullptr)
<= PC_BOUNDS_INVALID)
complaint (_("DW_AT_call_target target DIE has invalid "
"low pc, for referencing DIE %s [in module %s]"),
@@ -14004,10 +14009,9 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag,
static int
dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
CORE_ADDR *high_return, struct dwarf2_cu *cu,
- dwarf2_psymtab *ranges_pst, dwarf_tag tag)
+ addrmap *map, void *datum, dwarf_tag tag)
{
struct objfile *objfile = cu->per_objfile->objfile;
- dwarf2_per_bfd *per_bfd = cu->per_objfile->per_bfd;
struct gdbarch *gdbarch = objfile->arch ();
const CORE_ADDR baseaddr = objfile->text_section_offset ();
int low_set = 0;
@@ -14018,7 +14022,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
retval = dwarf2_ranges_process (offset, cu, tag,
[&] (CORE_ADDR range_beginning, CORE_ADDR range_end)
{
- if (ranges_pst != NULL)
+ if (map != nullptr)
{
CORE_ADDR lowpc;
CORE_ADDR highpc;
@@ -14029,8 +14033,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
highpc = (gdbarch_adjust_dwarf2_addr (gdbarch,
range_end + baseaddr)
- baseaddr);
- addrmap_set_empty (per_bfd->partial_symtabs->psymtabs_addrmap,
- lowpc, highpc - 1, ranges_pst);
+ addrmap_set_empty (map, lowpc, highpc - 1, datum);
}
/* FIXME: This is recording everything as a low-high
@@ -14073,7 +14076,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
static enum pc_bounds_kind
dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
CORE_ADDR *highpc, struct dwarf2_cu *cu,
- dwarf2_psymtab *pst)
+ addrmap *map, void *datum)
{
dwarf2_per_objfile *per_objfile = cu->per_objfile;
struct attribute *attr;
@@ -14116,8 +14119,8 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
/* Value of the DW_AT_ranges attribute is the offset in the
.debug_ranges section. */
- if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu, pst,
- die->tag))
+ if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu,
+ map, datum, die->tag))
return PC_BOUNDS_INVALID;
/* Found discontinuous range of addresses. */
ret = PC_BOUNDS_RANGES;
@@ -14160,7 +14163,8 @@ dwarf2_get_subprogram_pc_bounds (struct die_info *die,
CORE_ADDR low, high;
struct die_info *child = die->child;
- if (dwarf2_get_pc_bounds (die, &low, &high, cu, NULL) >= PC_BOUNDS_RANGES)
+ if (dwarf2_get_pc_bounds (die, &low, &high, cu, nullptr, nullptr)
+ >= PC_BOUNDS_RANGES)
{
*lowpc = std::min (*lowpc, low);
*highpc = std::max (*highpc, high);
@@ -14197,7 +14201,8 @@ get_scope_pc_bounds (struct die_info *die,
CORE_ADDR best_high = (CORE_ADDR) 0;
CORE_ADDR current_low, current_high;
- if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu, NULL)
+ if (dwarf2_get_pc_bounds (die, ¤t_low, ¤t_high, cu,
+ nullptr, nullptr)
>= PC_BOUNDS_RANGES)
{
best_low = current_low;
@@ -19414,7 +19419,7 @@ partial_die_info::read (const struct die_reader_specs *reader,
ranges_offset += cu->gnu_ranges_base;
if (dwarf2_ranges_read (ranges_offset, &lowpc, &highpc, cu,
- nullptr, tag))
+ nullptr, nullptr, tag))
has_pc_info = 1;
}
break;
--
2.31.1
next prev parent reply other threads:[~2021-08-26 2:19 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 2:19 [PATCH 00/30] Rewrite the DWARF "partial" reader Tom Tromey
2021-08-26 2:19 ` [PATCH 01/30] Introduce make_unique_xstrndup Tom Tromey
2021-08-26 2:19 ` [PATCH 02/30] Split create_addrmap_from_aranges Tom Tromey
2021-08-26 2:19 ` [PATCH 03/30] Add dwarf2_per_cu_data::addresses_seen Tom Tromey
2021-08-26 2:19 ` Tom Tromey [this message]
2021-08-26 2:19 ` [PATCH 05/30] Allow ada_decode not to decode operators Tom Tromey
2021-08-26 2:19 ` [PATCH 06/30] Let skip_one_die not skip children Tom Tromey
2021-08-26 2:19 ` [PATCH 07/30] Add name splitting Tom Tromey
2021-08-26 2:19 ` [PATCH 08/30] Add new overload of dwarf5_djb_hash Tom Tromey
2021-08-26 2:19 ` [PATCH 09/30] Refactor build_type_psymtabs_reader Tom Tromey
2021-08-26 2:19 ` [PATCH 10/30] Add batching parameter to parallel_for_each Tom Tromey
2021-08-26 2:19 ` [PATCH 11/30] Return vector of results from parallel_for_each Tom Tromey
2021-08-27 6:20 ` Tom de Vries
2021-08-28 19:20 ` Tom Tromey
2021-08-26 2:19 ` [PATCH 12/30] Introduce DWARF abbrev cache Tom Tromey
2021-08-26 2:19 ` [PATCH 13/30] Statically examine abbrev properties Tom Tromey
2021-09-06 22:31 ` Lancelot SIX
2021-11-04 18:00 ` Tom Tromey
2021-08-26 2:19 ` [PATCH 14/30] Update skip_one_die for new " Tom Tromey
2021-08-26 2:19 ` [PATCH 15/30] Introduce the new DWARF index class Tom Tromey
2021-09-09 23:32 ` Lancelot SIX
2021-11-04 18:03 ` Tom Tromey
2021-08-26 2:19 ` [PATCH 16/30] The new DWARF indexer Tom Tromey
2021-08-26 2:19 ` [PATCH 17/30] Implement quick_symbol_functions for cooked DWARF index Tom Tromey
2021-08-26 2:19 ` [PATCH 18/30] Wire in the new DWARF indexer Tom Tromey
2021-08-26 2:19 ` [PATCH 19/30] Pre-read DWARF section data Tom Tromey
2021-08-26 2:19 ` [PATCH 20/30] Parallelize DWARF indexing Tom Tromey
2021-08-26 2:19 ` [PATCH 21/30] "Finalize" the DWARF index in the background Tom Tromey
2021-08-26 2:19 ` [PATCH 22/30] Rename write_psymtabs_to_index Tom Tromey
2021-08-26 2:19 ` [PATCH 23/30] Change the key type in psym_index_map Tom Tromey
2021-08-26 2:19 ` [PATCH 24/30] Change parameters to write_address_map Tom Tromey
2021-08-26 2:19 ` [PATCH 25/30] Genericize addrmap handling in the DWARF index writer Tom Tromey
2021-08-26 2:19 ` [PATCH 26/30] Adapt .gdb_index writer to new DWARF scanner Tom Tromey
2021-08-26 2:19 ` [PATCH 27/30] Adapt .debug_names " Tom Tromey
2021-08-26 2:19 ` [PATCH 28/30] Enable the new DWARF indexer Tom Tromey
2021-08-26 2:19 ` [PATCH 29/30] Delete DWARF psymtab code Tom Tromey
2021-08-26 2:19 ` [PATCH 30/30] Remove dwarf2_per_cu_data::v Tom Tromey
2021-08-26 20:32 ` [PATCH 00/30] Rewrite the DWARF "partial" reader Tom de Vries
2021-08-26 21:29 ` Tom Tromey
2021-08-27 7:31 ` Tom de Vries
2021-08-30 15:04 ` Tom Tromey
2021-09-06 19:46 ` Tom Tromey
2021-09-07 10:58 ` Tom de Vries
2021-09-07 12:16 ` Tom de Vries
2021-10-29 23:06 ` Tom Tromey
2021-09-09 19:00 ` Wei-min Pan
2021-09-11 21:08 ` Tom Tromey
2021-09-13 16:50 ` Weimin Pan
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=20210826021937.1490292-5-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/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).