From: Tom Tromey Date: Sat, 12 Jun 2021 15:01:50 +0000 (-0600) Subject: Refactor dwarf2_get_pc_bounds X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6ee823fc4eae5024d85759bc1cc845058f1265a4;p=binutils-gdb.git Refactor dwarf2_get_pc_bounds 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. --- diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e0ae7330732..2ec4a49b592 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1297,7 +1297,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 *, @@ -7026,8 +7027,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 @@ -8147,9 +8151,9 @@ add_partial_module (struct partial_die_info *pdi, CORE_ADDR *lowpc, scan_partial_symbols (pdi->die_child, lowpc, highpc, set_addrmap, cu); } -static int -dwarf2_ranges_read (unsigned, CORE_ADDR *, CORE_ADDR *, struct dwarf2_cu *, - dwarf2_psymtab *, dwarf_tag); +static int dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return, + CORE_ADDR *high_return, struct dwarf2_cu *cu, + addrmap *map, void *datum, dwarf_tag tag); /* Read a partial die corresponding to a subprogram or an inlined subprogram and create a partial symbol for that subprogram. @@ -8203,6 +8207,9 @@ add_partial_subprogram (struct partial_die_info *pdi, if (pdi->has_range_info && dwarf2_ranges_read (pdi->ranges_offset, &pdi->lowpc, &pdi->highpc, cu, + (set_addrmap + ? cu->per_objfile->per_bfd->partial_symtabs->psymtabs_addrmap + : nullptr), set_addrmap ? cu->per_cu->v.psymtab : nullptr, pdi->tag)) { @@ -13098,7 +13105,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); @@ -13271,7 +13278,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 @@ -13537,7 +13544,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]"), @@ -14038,15 +14046,15 @@ dwarf2_ranges_process (unsigned offset, struct dwarf2_cu *cu, dwarf_tag tag, /* Get low and high pc attributes from DW_AT_ranges attribute value OFFSET. Return 1 if the attributes are present and valid, otherwise, return 0. - If RANGES_PST is not NULL we should set up the `psymtabs_addrmap'. */ + TAG is passed to dwarf2_ranges_process. If MAP is not NULL, then + ranges in MAP are set, using DATUM as the value. */ 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; @@ -14057,7 +14065,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; @@ -14068,8 +14076,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 @@ -14126,7 +14133,7 @@ dwarf2_ranges_read_low_addrs (unsigned offset, struct dwarf2_cu *cu, 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; @@ -14169,8 +14176,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; @@ -14213,7 +14220,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); @@ -14250,7 +14258,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;