* [PATCH 1/4] gdb/dwarf2: rename some things, index -> gdb_index
2023-02-13 14:55 [PATCH 0/4] Move index reading code out of dwarf2/read.c Simon Marchi
@ 2023-02-13 14:55 ` Simon Marchi
2023-02-13 23:30 ` Tom Tromey
2023-02-13 14:55 ` [PATCH 2/4] gdb/dwarf2: move some things to read.h Simon Marchi
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Simon Marchi @ 2023-02-13 14:55 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
This renaming helps make it clearer that these entites (classes,
functions) are specific to .gdb_index only, they are not shared with the
.debug_names handling.
Change-Id: I1a3cf3dbf450b62d1a0879d9aedd26397abdfd13
---
gdb/dwarf2/read.c | 69 ++++++++++++++++++++++++-----------------------
1 file changed, 35 insertions(+), 34 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index ce6c01ac7714..d504be58e676 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -198,9 +198,10 @@ class offset_view
gdb::array_view<const gdb_byte> m_bytes;
};
-/* A description of the mapped index. The file format is described in
+/* A description of .gdb_index index. The file format is described in
a comment by the code that writes the index. */
-struct mapped_index final : public mapped_index_base
+
+struct mapped_gdb_index final : public mapped_index_base
{
/* Index data format version. */
int version = 0;
@@ -1925,7 +1926,7 @@ struct dwarf2_debug_names_index : public dwarf2_base_index_functions
};
quick_symbol_functions_up
-mapped_index::make_quick_functions () const
+mapped_gdb_index::make_quick_functions () const
{
return quick_symbol_functions_up (new dwarf2_gdb_index);
}
@@ -2123,10 +2124,10 @@ create_cu_from_index_list (dwarf2_per_bfd *per_bfd,
CUs. */
static void
-create_cus_from_index_list (dwarf2_per_bfd *per_bfd,
- const gdb_byte *cu_list, offset_type n_elements,
- struct dwarf2_section_info *section,
- int is_dwz)
+create_cus_from_gdb_index_list (dwarf2_per_bfd *per_bfd,
+ const gdb_byte *cu_list, offset_type n_elements,
+ struct dwarf2_section_info *section,
+ int is_dwz)
{
for (offset_type i = 0; i < n_elements; i += 2)
{
@@ -2148,28 +2149,28 @@ create_cus_from_index_list (dwarf2_per_bfd *per_bfd,
the CU objects for PER_BFD. */
static void
-create_cus_from_index (dwarf2_per_bfd *per_bfd,
+create_cus_from_gdb_index (dwarf2_per_bfd *per_bfd,
const gdb_byte *cu_list, offset_type cu_list_elements,
const gdb_byte *dwz_list, offset_type dwz_elements)
{
gdb_assert (per_bfd->all_units.empty ());
per_bfd->all_units.reserve ((cu_list_elements + dwz_elements) / 2);
- create_cus_from_index_list (per_bfd, cu_list, cu_list_elements,
- &per_bfd->info, 0);
+ create_cus_from_gdb_index_list (per_bfd, cu_list, cu_list_elements,
+ &per_bfd->info, 0);
if (dwz_elements == 0)
return;
dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
- create_cus_from_index_list (per_bfd, dwz_list, dwz_elements,
- &dwz->info, 1);
+ create_cus_from_gdb_index_list (per_bfd, dwz_list, dwz_elements,
+ &dwz->info, 1);
}
/* Create the signatured type hash table from the index. */
static void
-create_signatured_type_table_from_index
+create_signatured_type_table_from_gdb_index
(dwarf2_per_bfd *per_bfd, struct dwarf2_section_info *section,
const gdb_byte *bytes, offset_type elements)
{
@@ -2253,12 +2254,12 @@ create_signatured_type_table_from_debug_names
per_objfile->per_bfd->signatured_types = std::move (sig_types_hash);
}
-/* Read the address map data from the mapped index, and use it to
+/* Read the address map data from the mapped GDB index, and use it to
populate the index_addrmap. */
static void
-create_addrmap_from_index (dwarf2_per_objfile *per_objfile,
- struct mapped_index *index)
+create_addrmap_from_gdb_index (dwarf2_per_objfile *per_objfile,
+ mapped_gdb_index *index)
{
struct objfile *objfile = per_objfile->objfile;
dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
@@ -2521,7 +2522,7 @@ static bool
read_gdb_index_from_buffer (const char *filename,
bool deprecated_ok,
gdb::array_view<const gdb_byte> buffer,
- struct mapped_index *map,
+ mapped_gdb_index *map,
const gdb_byte **cu_list,
offset_type *cu_list_elements,
const gdb_byte **types_list,
@@ -2652,7 +2653,7 @@ dwarf2_read_gdb_index
if (main_index_contents.empty ())
return 0;
- std::unique_ptr<struct mapped_index> map (new struct mapped_index);
+ std::unique_ptr<mapped_gdb_index> map (new mapped_gdb_index);
if (!read_gdb_index_from_buffer (objfile_name (objfile),
use_deprecated_index_sections,
main_index_contents, map.get (), &cu_list,
@@ -2669,7 +2670,7 @@ dwarf2_read_gdb_index
dwz = dwarf2_get_dwz_file (per_bfd);
if (dwz != NULL)
{
- struct mapped_index dwz_map;
+ mapped_gdb_index dwz_map;
const gdb_byte *dwz_types_ignore;
offset_type dwz_types_elements_ignore;
@@ -2691,8 +2692,8 @@ dwarf2_read_gdb_index
}
}
- create_cus_from_index (per_bfd, cu_list, cu_list_elements, dwz_list,
- dwz_list_elements);
+ create_cus_from_gdb_index (per_bfd, cu_list, cu_list_elements, dwz_list,
+ dwz_list_elements);
if (types_list_elements)
{
@@ -2709,13 +2710,13 @@ dwarf2_read_gdb_index
? &per_bfd->types[0]
: &per_bfd->info);
- create_signatured_type_table_from_index (per_bfd, section, types_list,
- types_list_elements);
+ create_signatured_type_table_from_gdb_index (per_bfd, section, types_list,
+ types_list_elements);
}
finalize_all_units (per_bfd);
- create_addrmap_from_index (per_objfile, map.get ());
+ create_addrmap_from_gdb_index (per_objfile, map.get ());
per_bfd->index_table = std::move (map);
per_bfd->quick_file_names_table =
@@ -2947,7 +2948,7 @@ dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
dwarf2_per_objfile *per_objfile,
gdb::optional<block_enum> block_index,
domain_enum domain, offset_type namei,
- mapped_index &index)
+ mapped_gdb_index &index)
{
iter->per_objfile = per_objfile;
iter->block_index = block_index;
@@ -2968,7 +2969,7 @@ dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
static struct dwarf2_per_cu_data *
dw2_symtab_iter_next (struct dw2_symtab_iterator *iter,
- mapped_index &index)
+ mapped_gdb_index &index)
{
dwarf2_per_objfile *per_objfile = iter->per_objfile;
@@ -3091,8 +3092,8 @@ dwarf2_gdb_index::dump (struct objfile *objfile)
{
dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
- mapped_index *index = (gdb::checked_static_cast<mapped_index *>
- (per_objfile->per_bfd->index_table.get ()));
+ mapped_gdb_index *index = (gdb::checked_static_cast<mapped_gdb_index *>
+ (per_objfile->per_bfd->index_table.get ()));
gdb_printf (".gdb_index: version %d\n", index->version);
gdb_printf ("\n");
}
@@ -3143,8 +3144,8 @@ dwarf2_gdb_index::expand_matching_symbols
const block_enum block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK;
- mapped_index &index
- = *(gdb::checked_static_cast<mapped_index *>
+ mapped_gdb_index &index
+ = *(gdb::checked_static_cast<mapped_gdb_index *>
(per_objfile->per_bfd->index_table.get ()));
const char *match_name = name.ada ().lookup_name ().c_str ();
@@ -3993,8 +3994,8 @@ dw2_expand_marked_cus
{
offset_type vec_len, vec_idx;
bool global_seen = false;
- mapped_index &index
- = *(gdb::checked_static_cast<mapped_index *>
+ mapped_gdb_index &index
+ = *(gdb::checked_static_cast<mapped_gdb_index *>
(per_objfile->per_bfd->index_table.get ()));
offset_view vec (index.constant_pool.slice (index.symbol_vec_index (idx)));
@@ -4213,8 +4214,8 @@ dwarf2_gdb_index::expand_symtabs_matching
return true;
}
- mapped_index &index
- = *(gdb::checked_static_cast<mapped_index *>
+ mapped_gdb_index &index
+ = *(gdb::checked_static_cast<mapped_gdb_index *>
(per_objfile->per_bfd->index_table.get ()));
bool result
--
2.39.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 1/4] gdb/dwarf2: rename some things, index -> gdb_index
2023-02-13 14:55 ` [PATCH 1/4] gdb/dwarf2: rename some things, index -> gdb_index Simon Marchi
@ 2023-02-13 23:30 ` Tom Tromey
2023-02-14 19:55 ` Simon Marchi
0 siblings, 1 reply; 13+ messages in thread
From: Tom Tromey @ 2023-02-13 23:30 UTC (permalink / raw)
To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi
>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
Simon> This renaming helps make it clearer that these entites (classes,
Simon> functions) are specific to .gdb_index only, they are not shared with the
Simon> .debug_names handling.
Thank you.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 1/4] gdb/dwarf2: rename some things, index -> gdb_index
2023-02-13 23:30 ` Tom Tromey
@ 2023-02-14 19:55 ` Simon Marchi
0 siblings, 0 replies; 13+ messages in thread
From: Simon Marchi @ 2023-02-14 19:55 UTC (permalink / raw)
To: Tom Tromey, Simon Marchi via Gdb-patches
On 2/13/23 18:30, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
>
> Simon> This renaming helps make it clearer that these entites (classes,
> Simon> functions) are specific to .gdb_index only, they are not shared with the
> Simon> .debug_names handling.
>
> Thank you.
> Approved-By: Tom Tromey <tom@tromey.com>
>
> Tom
I pushed just that patch, thanks.
Simon
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 2/4] gdb/dwarf2: move some things to read.h
2023-02-13 14:55 [PATCH 0/4] Move index reading code out of dwarf2/read.c Simon Marchi
2023-02-13 14:55 ` [PATCH 1/4] gdb/dwarf2: rename some things, index -> gdb_index Simon Marchi
@ 2023-02-13 14:55 ` Simon Marchi
2023-02-13 23:33 ` Tom Tromey
2023-02-13 14:55 ` [PATCH 3/4] gdb/dwarf2: split .gdb_index reading code to own file Simon Marchi
2023-02-13 14:55 ` [PATCH 4/4] gdb/dwarf2: split .debug_names " Simon Marchi
3 siblings, 1 reply; 13+ messages in thread
From: Simon Marchi @ 2023-02-13 14:55 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
The following 2 patches move .gdb_index and .debug_names reading code to
their own file. Prepare this by exposing some things used by that code
to read.h.
Change-Id: If8ef135758a2ff0ab3b765cc92596da8189f3bbd
---
gdb/dwarf2/read.c | 211 +++-------------------------------------------
gdb/dwarf2/read.h | 206 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 219 insertions(+), 198 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index d504be58e676..74856ce4a456 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -158,46 +158,6 @@ static int dwarf2_loclist_block_index;
/* Size of .debug_rnglists section header for 64-bit DWARF format. */
#define RNGLIST_HEADER_SIZE64 20
-/* This is a view into the index that converts from bytes to an
- offset_type, and allows indexing. Unaligned bytes are specifically
- allowed here, and handled via unpacking. */
-
-class offset_view
-{
-public:
- offset_view () = default;
-
- explicit offset_view (gdb::array_view<const gdb_byte> bytes)
- : m_bytes (bytes)
- {
- }
-
- /* Extract the INDEXth offset_type from the array. */
- offset_type operator[] (size_t index) const
- {
- const gdb_byte *bytes = &m_bytes[index * sizeof (offset_type)];
- return (offset_type) extract_unsigned_integer (bytes,
- sizeof (offset_type),
- BFD_ENDIAN_LITTLE);
- }
-
- /* Return the number of offset_types in this array. */
- size_t size () const
- {
- return m_bytes.size () / sizeof (offset_type);
- }
-
- /* Return true if this view is empty. */
- bool empty () const
- {
- return m_bytes.empty ();
- }
-
-private:
- /* The underlying bytes. */
- gdb::array_view<const gdb_byte> m_bytes;
-};
-
/* A description of .gdb_index index. The file format is described in
a comment by the code that writes the index. */
@@ -920,9 +880,6 @@ static const char *read_indirect_string
(dwarf2_per_objfile *per_objfile, bfd *, const gdb_byte *,
const struct comp_unit_head *, unsigned int *);
-static const char *read_indirect_string_at_offset
- (dwarf2_per_objfile *per_objfile, LONGEST str_offset);
-
static CORE_ADDR read_addr_index_from_leb128 (struct dwarf2_cu *,
const gdb_byte *,
unsigned int *);
@@ -1279,8 +1236,6 @@ static const char *compute_include_file_name
const file_and_directory &cu_info,
std::string &name_holder);
-static htab_up allocate_signatured_type_table ();
-
static htab_up allocate_dwo_unit_table ();
static struct dwo_unit *lookup_dwo_unit_in_dwp
@@ -1372,75 +1327,6 @@ line_header_eq_voidp (const void *item_lhs, const void *item_rhs)
&& ofs_lhs->offset_in_dwz == ofs_rhs->offset_in_dwz);
}
-\f
-
-/* An iterator for all_units that is based on index. This
- approach makes it possible to iterate over all_units safely,
- when some caller in the loop may add new units. */
-
-class all_units_iterator
-{
-public:
-
- all_units_iterator (dwarf2_per_bfd *per_bfd, bool start)
- : m_per_bfd (per_bfd),
- m_index (start ? 0 : per_bfd->all_units.size ())
- {
- }
-
- all_units_iterator &operator++ ()
- {
- ++m_index;
- return *this;
- }
-
- dwarf2_per_cu_data *operator* () const
- {
- return m_per_bfd->get_cu (m_index);
- }
-
- bool operator== (const all_units_iterator &other) const
- {
- return m_index == other.m_index;
- }
-
-
- bool operator!= (const all_units_iterator &other) const
- {
- return m_index != other.m_index;
- }
-
-private:
-
- dwarf2_per_bfd *m_per_bfd;
- size_t m_index;
-};
-
-/* A range adapter for the all_units_iterator. */
-class all_units_range
-{
-public:
-
- all_units_range (dwarf2_per_bfd *per_bfd)
- : m_per_bfd (per_bfd)
- {
- }
-
- all_units_iterator begin ()
- {
- return all_units_iterator (m_per_bfd, true);
- }
-
- all_units_iterator end ()
- {
- return all_units_iterator (m_per_bfd, false);
- }
-
-private:
-
- dwarf2_per_bfd *m_per_bfd;
-};
-
/* See declaration. */
dwarf2_per_bfd::dwarf2_per_bfd (bfd *obfd, const dwarf2_debug_sections *names,
@@ -1803,50 +1689,6 @@ struct quick_file_names
const char **real_names;
};
-struct dwarf2_base_index_functions : public quick_symbol_functions
-{
- bool has_symbols (struct objfile *objfile) override;
-
- bool has_unexpanded_symtabs (struct objfile *objfile) override;
-
- struct symtab *find_last_source_symtab (struct objfile *objfile) override;
-
- void forget_cached_source_info (struct objfile *objfile) override;
-
- enum language lookup_global_symbol_language (struct objfile *objfile,
- const char *name,
- domain_enum domain,
- bool *symbol_found_p) override
- {
- *symbol_found_p = false;
- return language_unknown;
- }
-
- void print_stats (struct objfile *objfile, bool print_bcache) override;
-
- void expand_all_symtabs (struct objfile *objfile) override;
-
- /* A helper function that finds the per-cu object from an "adjusted"
- PC -- a PC with the base text offset removed. */
- virtual dwarf2_per_cu_data *find_per_cu (dwarf2_per_bfd *per_bfd,
- CORE_ADDR adjusted_pc);
-
- struct compunit_symtab *find_pc_sect_compunit_symtab
- (struct objfile *objfile, struct bound_minimal_symbol msymbol,
- CORE_ADDR pc, struct obj_section *section, int warn_if_readin)
- override final;
-
- struct compunit_symtab *find_compunit_symtab_by_address
- (struct objfile *objfile, CORE_ADDR address) override
- {
- return nullptr;
- }
-
- void map_symbol_filenames (struct objfile *objfile,
- gdb::function_view<symbol_filename_ftype> fun,
- bool need_fullname) override;
-};
-
/* With OBJF_READNOW, the DWARF reader expands all CUs immediately.
It's handy in this case to have an empty implementation of the
quick symbol functions, to avoid special cases in the rest of the
@@ -1987,9 +1829,9 @@ eq_file_name_entry (const void *a, const void *b)
return eq_stmt_list_entry (&ea->hash, &eb->hash);
}
-/* Create a quick_file_names hash table. */
+/* See read.h. */
-static htab_up
+htab_up
create_quick_file_names_table (unsigned int nr_initial_entries)
{
return htab_up (htab_create_alloc (nr_initial_entries,
@@ -2621,8 +2463,6 @@ to use the section anyway."),
return 1;
}
-static void finalize_all_units (dwarf2_per_bfd *per_bfd);
-
/* Callback types for dwarf2_read_gdb_index. */
typedef gdb::function_view
@@ -3117,21 +2957,6 @@ dwarf2_base_index_functions::expand_all_symtabs (struct objfile *objfile)
}
}
-static bool
-dw2_expand_symtabs_matching_symbol
- (mapped_index_base &index,
- const lookup_name_info &lookup_name_in,
- gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
- gdb::function_view<bool (offset_type)> match_callback,
- dwarf2_per_objfile *per_objfile);
-
-static bool
-dw2_expand_symtabs_matching_one
- (dwarf2_per_cu_data *per_cu,
- dwarf2_per_objfile *per_objfile,
- gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
- gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
-
void
dwarf2_gdb_index::expand_matching_symbols
(struct objfile *objfile,
@@ -3394,14 +3219,9 @@ mapped_index_base::build_name_components (dwarf2_per_objfile *per_objfile)
name_comp_compare);
}
-/* Helper for dw2_expand_symtabs_matching that works with a
- mapped_index_base instead of the containing objfile. This is split
- to a separate function in order to be able to unit test the
- name_components matching using a mock mapped_index_base. For each
- symbol name that matches, calls MATCH_CALLBACK, passing it the
- symbol's index in the mapped_index_base symbol table. */
+/* See read.h. */
-static bool
+bool
dw2_expand_symtabs_matching_symbol
(mapped_index_base &index,
const lookup_name_info &lookup_name_in,
@@ -3954,12 +3774,9 @@ run_test ()
#endif /* GDB_SELF_TEST */
-/* If FILE_MATCHER is NULL or if PER_CU has
- dwarf2_per_cu_quick_data::MARK set (see
- dw_expand_symtabs_matching_file_matcher), expand the CU and call
- EXPANSION_NOTIFY on it. */
+/* See read.h. */
-static bool
+bool
dw2_expand_symtabs_matching_one
(dwarf2_per_cu_data *per_cu,
dwarf2_per_objfile *per_objfile,
@@ -4081,11 +3898,9 @@ dw2_expand_marked_cus
return true;
}
-/* If FILE_MATCHER is non-NULL, set all the
- dwarf2_per_cu_quick_data::MARK of the current DWARF2_PER_OBJFILE
- that match FILE_MATCHER. */
+/* See read.h. */
-static void
+void
dw_expand_symtabs_matching_file_matcher
(dwarf2_per_objfile *per_objfile,
gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher)
@@ -5522,9 +5337,9 @@ eq_signatured_type (const void *item_lhs, const void *item_rhs)
return lhs->signature == rhs->signature;
}
-/* Allocate a hash table for signatured types. */
+/* See read.h. */
-static htab_up
+htab_up
allocate_signatured_type_table ()
{
return htab_up (htab_create_alloc (41,
@@ -7245,7 +7060,7 @@ read_comp_units_from_section (dwarf2_per_objfile *per_objfile,
/* Initialize the views on all_units. */
-static void
+void
finalize_all_units (dwarf2_per_bfd *per_bfd)
{
size_t nr_tus = per_bfd->tu_stats.nr_tus;
@@ -19342,9 +19157,9 @@ read_attribute (const struct die_reader_specs *reader,
abbrev->implicit_const, info_ptr);
}
-/* Return pointer to string at .debug_str offset STR_OFFSET. */
+/* See read.h. */
-static const char *
+const char *
read_indirect_string_at_offset (dwarf2_per_objfile *per_objfile,
LONGEST str_offset)
{
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 8045a57563f9..476905c23737 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -558,6 +558,73 @@ struct dwarf2_per_bfd
struct addrmap *index_addrmap = nullptr;
};
+/* An iterator for all_units that is based on index. This
+ approach makes it possible to iterate over all_units safely,
+ when some caller in the loop may add new units. */
+
+class all_units_iterator
+{
+public:
+
+ all_units_iterator (dwarf2_per_bfd *per_bfd, bool start)
+ : m_per_bfd (per_bfd),
+ m_index (start ? 0 : per_bfd->all_units.size ())
+ {
+ }
+
+ all_units_iterator &operator++ ()
+ {
+ ++m_index;
+ return *this;
+ }
+
+ dwarf2_per_cu_data *operator* () const
+ {
+ return m_per_bfd->get_cu (m_index);
+ }
+
+ bool operator== (const all_units_iterator &other) const
+ {
+ return m_index == other.m_index;
+ }
+
+
+ bool operator!= (const all_units_iterator &other) const
+ {
+ return m_index != other.m_index;
+ }
+
+private:
+
+ dwarf2_per_bfd *m_per_bfd;
+ size_t m_index;
+};
+
+/* A range adapter for the all_units_iterator. */
+class all_units_range
+{
+public:
+
+ all_units_range (dwarf2_per_bfd *per_bfd)
+ : m_per_bfd (per_bfd)
+ {
+ }
+
+ all_units_iterator begin ()
+ {
+ return all_units_iterator (m_per_bfd, true);
+ }
+
+ all_units_iterator end ()
+ {
+ return all_units_iterator (m_per_bfd, false);
+ }
+
+private:
+
+ dwarf2_per_bfd *m_per_bfd;
+};
+
/* This is the per-objfile data associated with a type_unit_group. */
struct type_unit_group_unshareable
@@ -764,4 +831,143 @@ extern void dwarf2_get_section_info (struct objfile *,
/* Return true if the producer of the inferior is clang. */
extern bool producer_is_clang (struct dwarf2_cu *cu);
+/* Interface for DWARF indexing methods. */
+
+struct dwarf2_base_index_functions : public quick_symbol_functions
+{
+ bool has_symbols (struct objfile *objfile) override;
+
+ bool has_unexpanded_symtabs (struct objfile *objfile) override;
+
+ struct symtab *find_last_source_symtab (struct objfile *objfile) override;
+
+ void forget_cached_source_info (struct objfile *objfile) override;
+
+ enum language lookup_global_symbol_language (struct objfile *objfile,
+ const char *name,
+ domain_enum domain,
+ bool *symbol_found_p) override
+ {
+ *symbol_found_p = false;
+ return language_unknown;
+ }
+
+ void print_stats (struct objfile *objfile, bool print_bcache) override;
+
+ void expand_all_symtabs (struct objfile *objfile) override;
+
+ /* A helper function that finds the per-cu object from an "adjusted"
+ PC -- a PC with the base text offset removed. */
+ virtual dwarf2_per_cu_data *find_per_cu (dwarf2_per_bfd *per_bfd,
+ CORE_ADDR adjusted_pc);
+
+ struct compunit_symtab *find_pc_sect_compunit_symtab
+ (struct objfile *objfile, struct bound_minimal_symbol msymbol,
+ CORE_ADDR pc, struct obj_section *section, int warn_if_readin)
+ override final;
+
+ struct compunit_symtab *find_compunit_symtab_by_address
+ (struct objfile *objfile, CORE_ADDR address) override
+ {
+ return nullptr;
+ }
+
+ void map_symbol_filenames (struct objfile *objfile,
+ gdb::function_view<symbol_filename_ftype> fun,
+ bool need_fullname) override;
+};
+
+/* If FILE_MATCHER is NULL or if PER_CU has
+ dwarf2_per_cu_quick_data::MARK set (see
+ dw_expand_symtabs_matching_file_matcher), expand the CU and call
+ EXPANSION_NOTIFY on it. */
+
+bool
+dw2_expand_symtabs_matching_one
+ (dwarf2_per_cu_data *per_cu,
+ dwarf2_per_objfile *per_objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
+
+/* Helper for dw2_expand_symtabs_matching that works with a
+ mapped_index_base instead of the containing objfile. This is split
+ to a separate function in order to be able to unit test the
+ name_components matching using a mock mapped_index_base. For each
+ symbol name that matches, calls MATCH_CALLBACK, passing it the
+ symbol's index in the mapped_index_base symbol table. */
+
+bool
+dw2_expand_symtabs_matching_symbol
+ (mapped_index_base &index,
+ const lookup_name_info &lookup_name_in,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<bool (offset_type)> match_callback,
+ dwarf2_per_objfile *per_objfile);
+
+/* If FILE_MATCHER is non-NULL, set all the
+ dwarf2_per_cu_quick_data::MARK of the current DWARF2_PER_OBJFILE
+ that match FILE_MATCHER. */
+
+void
+dw_expand_symtabs_matching_file_matcher
+ (dwarf2_per_objfile *per_objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher);
+
+/* This is a view into the index that converts from bytes to an
+ offset_type, and allows indexing. Unaligned bytes are specifically
+ allowed here, and handled via unpacking. */
+
+class offset_view
+{
+public:
+ offset_view () = default;
+
+ explicit offset_view (gdb::array_view<const gdb_byte> bytes)
+ : m_bytes (bytes)
+ {
+ }
+
+ /* Extract the INDEXth offset_type from the array. */
+ offset_type operator[] (size_t index) const
+ {
+ const gdb_byte *bytes = &m_bytes[index * sizeof (offset_type)];
+ return (offset_type) extract_unsigned_integer (bytes,
+ sizeof (offset_type),
+ BFD_ENDIAN_LITTLE);
+ }
+
+ /* Return the number of offset_types in this array. */
+ size_t size () const
+ {
+ return m_bytes.size () / sizeof (offset_type);
+ }
+
+ /* Return true if this view is empty. */
+ bool empty () const
+ {
+ return m_bytes.empty ();
+ }
+
+private:
+ /* The underlying bytes. */
+ gdb::array_view<const gdb_byte> m_bytes;
+};
+
+/* Return pointer to string at .debug_str offset STR_OFFSET. */
+
+const char *read_indirect_string_at_offset
+ (dwarf2_per_objfile *per_objfile, LONGEST str_offset);
+
+/* Allocate a hash table for signatured types. */
+
+htab_up allocate_signatured_type_table ();
+
+/* Initialize the views on all_units. */
+
+void finalize_all_units (dwarf2_per_bfd *per_bfd);
+
+/* Create a quick_file_names hash table. */
+
+htab_up create_quick_file_names_table (unsigned int nr_initial_entries);
+
#endif /* DWARF2READ_H */
--
2.39.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/4] gdb/dwarf2: move some things to read.h
2023-02-13 14:55 ` [PATCH 2/4] gdb/dwarf2: move some things to read.h Simon Marchi
@ 2023-02-13 23:33 ` Tom Tromey
2023-02-14 2:24 ` Thiago Jung Bauermann
2023-02-14 19:37 ` Simon Marchi
0 siblings, 2 replies; 13+ messages in thread
From: Tom Tromey @ 2023-02-13 23:33 UTC (permalink / raw)
To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi
>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
Simon> The following 2 patches move .gdb_index and .debug_names reading code to
Simon> their own file. Prepare this by exposing some things used by that code
Simon> to read.h.
Simon> +/* If FILE_MATCHER is NULL or if PER_CU has
Simon> + dwarf2_per_cu_quick_data::MARK set (see
Simon> + dw_expand_symtabs_matching_file_matcher), expand the CU and call
Simon> + EXPANSION_NOTIFY on it. */
Simon> +
Simon> +bool
Simon> +dw2_expand_symtabs_matching_one
Simon> + (dwarf2_per_cu_data *per_cu,
Simon> + dwarf2_per_objfile *per_objfile,
Simon> + gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
Simon> + gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
Don't we normally write "extern" in headers?
Also normally in declarations the type is on the same line as the
function name.
Simon> +/* This is a view into the index that converts from bytes to an
Simon> + offset_type, and allows indexing. Unaligned bytes are specifically
Simon> + allowed here, and handled via unpacking. */
Simon> +
Simon> +class offset_view
Simon> +{
Simon> +public:
Simon> + offset_view () = default;
I think this type should be specific to .gdb_index. It shouldn't be
needed anywhere else -- it's there to work around the lack of alignment.
If it is needed somewhere else, I suppose it's fine, it would just be
better to refactor so that this can be an implementation detail of
.gdb_index again.
Tom
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/4] gdb/dwarf2: move some things to read.h
2023-02-13 23:33 ` Tom Tromey
@ 2023-02-14 2:24 ` Thiago Jung Bauermann
2023-02-14 19:35 ` Simon Marchi
2023-02-14 19:37 ` Simon Marchi
1 sibling, 1 reply; 13+ messages in thread
From: Thiago Jung Bauermann @ 2023-02-14 2:24 UTC (permalink / raw)
To: Tom Tromey; +Cc: Simon Marchi, gdb-patches
Tom Tromey <tom@tromey.com> writes:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
>
> Simon> The following 2 patches move .gdb_index and .debug_names reading code to
> Simon> their own file. Prepare this by exposing some things used by that code
> Simon> to read.h.
>
> Simon> +/* If FILE_MATCHER is NULL or if PER_CU has
> Simon> + dwarf2_per_cu_quick_data::MARK set (see
> Simon> + dw_expand_symtabs_matching_file_matcher), expand the CU and call
> Simon> + EXPANSION_NOTIFY on it. */
> Simon> +
> Simon> +bool
> Simon> +dw2_expand_symtabs_matching_one
> Simon> + (dwarf2_per_cu_data *per_cu,
> Simon> + dwarf2_per_objfile *per_objfile,
> Simon> + gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
> Simon> + gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
>
> Don't we normally write "extern" in headers?
IIUC “extern” is only meaningful for variable and template declarations.
--
Thiago
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/4] gdb/dwarf2: move some things to read.h
2023-02-14 2:24 ` Thiago Jung Bauermann
@ 2023-02-14 19:35 ` Simon Marchi
0 siblings, 0 replies; 13+ messages in thread
From: Simon Marchi @ 2023-02-14 19:35 UTC (permalink / raw)
To: Thiago Jung Bauermann, Tom Tromey; +Cc: gdb-patches
On 2/13/23 21:24, Thiago Jung Bauermann wrote:
>
> Tom Tromey <tom@tromey.com> writes:
>
>>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
>>
>> Simon> The following 2 patches move .gdb_index and .debug_names reading code to
>> Simon> their own file. Prepare this by exposing some things used by that code
>> Simon> to read.h.
>>
>> Simon> +/* If FILE_MATCHER is NULL or if PER_CU has
>> Simon> + dwarf2_per_cu_quick_data::MARK set (see
>> Simon> + dw_expand_symtabs_matching_file_matcher), expand the CU and call
>> Simon> + EXPANSION_NOTIFY on it. */
>> Simon> +
>> Simon> +bool
>> Simon> +dw2_expand_symtabs_matching_one
>> Simon> + (dwarf2_per_cu_data *per_cu,
>> Simon> + dwarf2_per_objfile *per_objfile,
>> Simon> + gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
>> Simon> + gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
>>
>> Don't we normally write "extern" in headers?
>
> IIUC “extern” is only meaningful for variable and template declarations.
For some reason, our coding standards says we should use extern for
function declarations:
https://sourceware.org/gdb/wiki/Internals%20GDB-C-Coding-Standards#Function_Prototypes
But I don't understand why, IMO it just consumes some columns for no
purpose. Also, it's not always respected, there are many header files
that don't use it.
Simon
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 2/4] gdb/dwarf2: move some things to read.h
2023-02-13 23:33 ` Tom Tromey
2023-02-14 2:24 ` Thiago Jung Bauermann
@ 2023-02-14 19:37 ` Simon Marchi
1 sibling, 0 replies; 13+ messages in thread
From: Simon Marchi @ 2023-02-14 19:37 UTC (permalink / raw)
To: Tom Tromey, Simon Marchi via Gdb-patches
On 2/13/23 18:33, Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
>
> Simon> The following 2 patches move .gdb_index and .debug_names reading code to
> Simon> their own file. Prepare this by exposing some things used by that code
> Simon> to read.h.
>
> Simon> +/* If FILE_MATCHER is NULL or if PER_CU has
> Simon> + dwarf2_per_cu_quick_data::MARK set (see
> Simon> + dw_expand_symtabs_matching_file_matcher), expand the CU and call
> Simon> + EXPANSION_NOTIFY on it. */
> Simon> +
> Simon> +bool
> Simon> +dw2_expand_symtabs_matching_one
> Simon> + (dwarf2_per_cu_data *per_cu,
> Simon> + dwarf2_per_objfile *per_objfile,
> Simon> + gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
> Simon> + gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify);
>
> Don't we normally write "extern" in headers?
I added those.
> Also normally in declarations the type is on the same line as the
> function name.
My bad, I just copy pasted the line from the definition and forgot to
adjust them. Done now.
> Simon> +/* This is a view into the index that converts from bytes to an
> Simon> + offset_type, and allows indexing. Unaligned bytes are specifically
> Simon> + allowed here, and handled via unpacking. */
> Simon> +
> Simon> +class offset_view
> Simon> +{
> Simon> +public:
> Simon> + offset_view () = default;
>
> I think this type should be specific to .gdb_index. It shouldn't be
> needed anywhere else -- it's there to work around the lack of alignment.
Nice find, I thought it was used in .debug_names too, but no. I will
revert this part of this patch, and the class will go to
read-gdb-index.c in the following patch.
Simon
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/4] gdb/dwarf2: split .gdb_index reading code to own file
2023-02-13 14:55 [PATCH 0/4] Move index reading code out of dwarf2/read.c Simon Marchi
2023-02-13 14:55 ` [PATCH 1/4] gdb/dwarf2: rename some things, index -> gdb_index Simon Marchi
2023-02-13 14:55 ` [PATCH 2/4] gdb/dwarf2: move some things to read.h Simon Marchi
@ 2023-02-13 14:55 ` Simon Marchi
2023-02-13 23:35 ` Tom Tromey
2023-02-13 14:55 ` [PATCH 4/4] gdb/dwarf2: split .debug_names " Simon Marchi
3 siblings, 1 reply; 13+ messages in thread
From: Simon Marchi @ 2023-02-13 14:55 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
Move everything related to reading .gdb_index from read.c to
read-gdb-index.c. The only entry point exposed by read-gdb-index.{c,h}
is dwarf2_read_gdb_index.
Change-Id: I1e32c8f0720086538de8d2f612f27545377099bc
---
gdb/Makefile.in | 2 +
gdb/dwarf2/read-gdb-index.c | 835 ++++++++++++++++++++++++++++++++++++
gdb/dwarf2/read-gdb-index.h | 47 ++
gdb/dwarf2/read.c | 807 +---------------------------------
gdb/dwarf2/read.h | 9 +
5 files changed, 896 insertions(+), 804 deletions(-)
create mode 100644 gdb/dwarf2/read-gdb-index.c
create mode 100644 gdb/dwarf2/read-gdb-index.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index dac5a66e9ada..5a0b3c856d30 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1082,6 +1082,7 @@ COMMON_SFILES = \
dwarf2/loc.c \
dwarf2/macro.c \
dwarf2/read.c \
+ dwarf2/read-gdb-index.c \
dwarf2/section.c \
dwarf2/stringify.c \
eval.c \
@@ -1325,6 +1326,7 @@ HFILES_NO_SRCDIR = \
dwarf2/index-common.h \
dwarf2/loc.h \
dwarf2/read.h \
+ dwarf2/read-gdb-index.h \
event-top.h \
exceptions.h \
exec.h \
diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c
new file mode 100644
index 000000000000..65956f0b4aff
--- /dev/null
+++ b/gdb/dwarf2/read-gdb-index.c
@@ -0,0 +1,835 @@
+/* Reading code for .gdb_index
+
+ Copyright (C) 2023 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "read-gdb-index.h"
+
+#include "cli/cli-cmds.h"
+#include "complaints.h"
+#include "dwz.h"
+#include "gdb/gdb-index.h"
+#include "gdbsupport/gdb-checked-static-cast.h"
+#include "mapped-index.h"
+#include "read.h"
+
+/* When true, do not reject deprecated .gdb_index sections. */
+static bool use_deprecated_index_sections = false;
+
+
+/* A description of .gdb_index index. The file format is described in
+ a comment by the code that writes the index. */
+
+struct mapped_gdb_index final : public mapped_index_base
+{
+ /* Index data format version. */
+ int version = 0;
+
+ /* The address table data. */
+ gdb::array_view<const gdb_byte> address_table;
+
+ /* The symbol table, implemented as a hash table. */
+ offset_view symbol_table;
+
+ /* A pointer to the constant pool. */
+ gdb::array_view<const gdb_byte> constant_pool;
+
+ /* Return the index into the constant pool of the name of the IDXth
+ symbol in the symbol table. */
+ offset_type symbol_name_index (offset_type idx) const
+ {
+ return symbol_table[2 * idx];
+ }
+
+ /* Return the index into the constant pool of the CU vector of the
+ IDXth symbol in the symbol table. */
+ offset_type symbol_vec_index (offset_type idx) const
+ {
+ return symbol_table[2 * idx + 1];
+ }
+
+ bool symbol_name_slot_invalid (offset_type idx) const override
+ {
+ return (symbol_name_index (idx) == 0
+ && symbol_vec_index (idx) == 0);
+ }
+
+ /* Convenience method to get at the name of the symbol at IDX in the
+ symbol table. */
+ const char *symbol_name_at
+ (offset_type idx, dwarf2_per_objfile *per_objfile) const override
+ {
+ return (const char *) (this->constant_pool.data ()
+ + symbol_name_index (idx));
+ }
+
+ size_t symbol_name_count () const override
+ { return this->symbol_table.size () / 2; }
+
+ quick_symbol_functions_up make_quick_functions () const override;
+
+ bool version_check () const override
+ {
+ return version >= 8;
+ }
+};
+
+struct dwarf2_gdb_index : public dwarf2_base_index_functions
+{
+ /* This dumps minimal information about the index.
+ It is called via "mt print objfiles".
+ One use is to verify .gdb_index has been loaded by the
+ gdb.dwarf2/gdb-index.exp testcase. */
+ void dump (struct objfile *objfile) override;
+
+ void expand_matching_symbols
+ (struct objfile *,
+ const lookup_name_info &lookup_name,
+ domain_enum domain,
+ int global,
+ symbol_compare_ftype *ordered_compare) override;
+
+ bool expand_symtabs_matching
+ (struct objfile *objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info *lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ block_search_flags search_flags,
+ domain_enum domain,
+ enum search_domain kind) override;
+};
+
+/* This dumps minimal information about the index.
+ It is called via "mt print objfiles".
+ One use is to verify .gdb_index has been loaded by the
+ gdb.dwarf2/gdb-index.exp testcase. */
+
+void
+dwarf2_gdb_index::dump (struct objfile *objfile)
+{
+ dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
+
+ mapped_gdb_index *index = (gdb::checked_static_cast<mapped_gdb_index *>
+ (per_objfile->per_bfd->index_table.get ()));
+ gdb_printf (".gdb_index: version %d\n", index->version);
+ gdb_printf ("\n");
+}
+
+/* Struct used to manage iterating over all CUs looking for a symbol. */
+
+struct dw2_symtab_iterator
+{
+ /* The dwarf2_per_objfile owning the CUs we are iterating on. */
+ dwarf2_per_objfile *per_objfile;
+ /* If set, only look for symbols that match that block. Valid values are
+ GLOBAL_BLOCK and STATIC_BLOCK. */
+ gdb::optional<block_enum> block_index;
+ /* The kind of symbol we're looking for. */
+ domain_enum domain;
+ /* The list of CUs from the index entry of the symbol,
+ or NULL if not found. */
+ offset_view vec;
+ /* The next element in VEC to look at. */
+ int next;
+ /* The number of elements in VEC, or zero if there is no match. */
+ int length;
+ /* Have we seen a global version of the symbol?
+ If so we can ignore all further global instances.
+ This is to work around gold/15646, inefficient gold-generated
+ indices. */
+ int global_seen;
+};
+
+/* Initialize the index symtab iterator ITER, offset_type NAMEI variant. */
+
+static void
+dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
+ dwarf2_per_objfile *per_objfile,
+ gdb::optional<block_enum> block_index,
+ domain_enum domain, offset_type namei,
+ mapped_gdb_index &index)
+{
+ iter->per_objfile = per_objfile;
+ iter->block_index = block_index;
+ iter->domain = domain;
+ iter->next = 0;
+ iter->global_seen = 0;
+ iter->vec = {};
+ iter->length = 0;
+
+ gdb_assert (!index.symbol_name_slot_invalid (namei));
+ offset_type vec_idx = index.symbol_vec_index (namei);
+
+ iter->vec = offset_view (index.constant_pool.slice (vec_idx));
+ iter->length = iter->vec[0];
+}
+
+/* Return the next matching CU or NULL if there are no more. */
+
+static struct dwarf2_per_cu_data *
+dw2_symtab_iter_next (struct dw2_symtab_iterator *iter,
+ mapped_gdb_index &index)
+{
+ dwarf2_per_objfile *per_objfile = iter->per_objfile;
+
+ for ( ; iter->next < iter->length; ++iter->next)
+ {
+ offset_type cu_index_and_attrs = iter->vec[iter->next + 1];
+ offset_type cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs);
+ gdb_index_symbol_kind symbol_kind =
+ GDB_INDEX_SYMBOL_KIND_VALUE (cu_index_and_attrs);
+ /* Only check the symbol attributes if they're present.
+ Indices prior to version 7 don't record them,
+ and indices >= 7 may elide them for certain symbols
+ (gold does this). */
+ int attrs_valid = (index.version >= 7
+ && symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
+
+ /* Don't crash on bad data. */
+ if (cu_index >= per_objfile->per_bfd->all_units.size ())
+ {
+ complaint (_(".gdb_index entry has bad CU index"
+ " [in module %s]"), objfile_name (per_objfile->objfile));
+ continue;
+ }
+
+ dwarf2_per_cu_data *per_cu = per_objfile->per_bfd->get_cu (cu_index);
+
+ /* Skip if already read in. */
+ if (per_objfile->symtab_set_p (per_cu))
+ continue;
+
+ /* Check static vs global. */
+ if (attrs_valid)
+ {
+ bool is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
+
+ if (iter->block_index.has_value ())
+ {
+ bool want_static = *iter->block_index == STATIC_BLOCK;
+
+ if (is_static != want_static)
+ continue;
+ }
+
+ /* Work around gold/15646. */
+ if (!is_static
+ && symbol_kind == GDB_INDEX_SYMBOL_KIND_TYPE)
+ {
+ if (iter->global_seen)
+ continue;
+
+ iter->global_seen = 1;
+ }
+ }
+
+ /* Only check the symbol's kind if it has one. */
+ if (attrs_valid)
+ {
+ switch (iter->domain)
+ {
+ case VAR_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_VARIABLE
+ && symbol_kind != GDB_INDEX_SYMBOL_KIND_FUNCTION
+ /* Some types are also in VAR_DOMAIN. */
+ && symbol_kind != GDB_INDEX_SYMBOL_KIND_TYPE)
+ continue;
+ break;
+ case STRUCT_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_TYPE)
+ continue;
+ break;
+ case LABEL_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_OTHER)
+ continue;
+ break;
+ case MODULE_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_OTHER)
+ continue;
+ break;
+ default:
+ break;
+ }
+ }
+
+ ++iter->next;
+ return per_cu;
+ }
+
+ return NULL;
+}
+
+void
+dwarf2_gdb_index::expand_matching_symbols
+ (struct objfile *objfile,
+ const lookup_name_info &name, domain_enum domain,
+ int global,
+ symbol_compare_ftype *ordered_compare)
+{
+ /* Used for Ada. */
+ dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
+
+ const block_enum block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK;
+
+ mapped_gdb_index &index
+ = *(gdb::checked_static_cast<mapped_gdb_index *>
+ (per_objfile->per_bfd->index_table.get ()));
+
+ const char *match_name = name.ada ().lookup_name ().c_str ();
+ auto matcher = [&] (const char *symname)
+ {
+ if (ordered_compare == nullptr)
+ return true;
+ return ordered_compare (symname, match_name) == 0;
+ };
+
+ dw2_expand_symtabs_matching_symbol (index, name, matcher,
+ [&] (offset_type namei)
+ {
+ struct dw2_symtab_iterator iter;
+ struct dwarf2_per_cu_data *per_cu;
+
+ dw2_symtab_iter_init (&iter, per_objfile, block_kind, domain, namei,
+ index);
+ while ((per_cu = dw2_symtab_iter_next (&iter, index)) != NULL)
+ dw2_expand_symtabs_matching_one (per_cu, per_objfile, nullptr,
+ nullptr);
+ return true;
+ }, per_objfile);
+}
+
+/* Helper for dw2_expand_matching symtabs. Called on each symbol
+ matched, to expand corresponding CUs that were marked. IDX is the
+ index of the symbol name that matched. */
+
+static bool
+dw2_expand_marked_cus
+ (dwarf2_per_objfile *per_objfile, offset_type idx,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ block_search_flags search_flags,
+ search_domain kind)
+{
+ offset_type vec_len, vec_idx;
+ bool global_seen = false;
+ mapped_gdb_index &index
+ = *(gdb::checked_static_cast<mapped_gdb_index *>
+ (per_objfile->per_bfd->index_table.get ()));
+
+ offset_view vec (index.constant_pool.slice (index.symbol_vec_index (idx)));
+ vec_len = vec[0];
+ for (vec_idx = 0; vec_idx < vec_len; ++vec_idx)
+ {
+ offset_type cu_index_and_attrs = vec[vec_idx + 1];
+ /* This value is only valid for index versions >= 7. */
+ int is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
+ gdb_index_symbol_kind symbol_kind =
+ GDB_INDEX_SYMBOL_KIND_VALUE (cu_index_and_attrs);
+ int cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs);
+ /* Only check the symbol attributes if they're present.
+ Indices prior to version 7 don't record them,
+ and indices >= 7 may elide them for certain symbols
+ (gold does this). */
+ int attrs_valid =
+ (index.version >= 7
+ && symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
+
+ /* Work around gold/15646. */
+ if (attrs_valid
+ && !is_static
+ && symbol_kind == GDB_INDEX_SYMBOL_KIND_TYPE)
+ {
+ if (global_seen)
+ continue;
+
+ global_seen = true;
+ }
+
+ /* Only check the symbol's kind if it has one. */
+ if (attrs_valid)
+ {
+ if (is_static)
+ {
+ if ((search_flags & SEARCH_STATIC_BLOCK) == 0)
+ continue;
+ }
+ else
+ {
+ if ((search_flags & SEARCH_GLOBAL_BLOCK) == 0)
+ continue;
+ }
+
+ switch (kind)
+ {
+ case VARIABLES_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_VARIABLE)
+ continue;
+ break;
+ case FUNCTIONS_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_FUNCTION)
+ continue;
+ break;
+ case TYPES_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_TYPE)
+ continue;
+ break;
+ case MODULES_DOMAIN:
+ if (symbol_kind != GDB_INDEX_SYMBOL_KIND_OTHER)
+ continue;
+ break;
+ default:
+ break;
+ }
+ }
+
+ /* Don't crash on bad data. */
+ if (cu_index >= per_objfile->per_bfd->all_units.size ())
+ {
+ complaint (_(".gdb_index entry has bad CU index"
+ " [in module %s]"), objfile_name (per_objfile->objfile));
+ continue;
+ }
+
+ dwarf2_per_cu_data *per_cu = per_objfile->per_bfd->get_cu (cu_index);
+ if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile, file_matcher,
+ expansion_notify))
+ return false;
+ }
+
+ return true;
+}
+
+bool
+dwarf2_gdb_index::expand_symtabs_matching
+ (struct objfile *objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info *lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ block_search_flags search_flags,
+ domain_enum domain,
+ enum search_domain kind)
+{
+ dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
+
+ dw_expand_symtabs_matching_file_matcher (per_objfile, file_matcher);
+
+ /* This invariant is documented in quick-functions.h. */
+ gdb_assert (lookup_name != nullptr || symbol_matcher == nullptr);
+ if (lookup_name == nullptr)
+ {
+ for (dwarf2_per_cu_data *per_cu
+ : all_units_range (per_objfile->per_bfd))
+ {
+ QUIT;
+
+ if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
+ file_matcher,
+ expansion_notify))
+ return false;
+ }
+ return true;
+ }
+
+ mapped_gdb_index &index
+ = *(gdb::checked_static_cast<mapped_gdb_index *>
+ (per_objfile->per_bfd->index_table.get ()));
+
+ bool result
+ = dw2_expand_symtabs_matching_symbol (index, *lookup_name,
+ symbol_matcher,
+ [&] (offset_type idx)
+ {
+ if (!dw2_expand_marked_cus (per_objfile, idx, file_matcher,
+ expansion_notify, search_flags, kind))
+ return false;
+ return true;
+ }, per_objfile);
+
+ return result;
+}
+
+quick_symbol_functions_up
+mapped_gdb_index::make_quick_functions () const
+{
+ return quick_symbol_functions_up (new dwarf2_gdb_index);
+}
+
+/* A helper function that reads the .gdb_index from BUFFER and fills
+ in MAP. FILENAME is the name of the file containing the data;
+ it is used for error reporting. DEPRECATED_OK is true if it is
+ ok to use deprecated sections.
+
+ CU_LIST, CU_LIST_ELEMENTS, TYPES_LIST, and TYPES_LIST_ELEMENTS are
+ out parameters that are filled in with information about the CU and
+ TU lists in the section.
+
+ Returns true if all went well, false otherwise. */
+
+static bool
+read_gdb_index_from_buffer (const char *filename,
+ bool deprecated_ok,
+ gdb::array_view<const gdb_byte> buffer,
+ mapped_gdb_index *map,
+ const gdb_byte **cu_list,
+ offset_type *cu_list_elements,
+ const gdb_byte **types_list,
+ offset_type *types_list_elements)
+{
+ const gdb_byte *addr = &buffer[0];
+ offset_view metadata (buffer);
+
+ /* Version check. */
+ offset_type version = metadata[0];
+ /* Versions earlier than 3 emitted every copy of a psymbol. This
+ causes the index to behave very poorly for certain requests. Version 3
+ contained incomplete addrmap. So, it seems better to just ignore such
+ indices. */
+ if (version < 4)
+ {
+ static int warning_printed = 0;
+ if (!warning_printed)
+ {
+ warning (_("Skipping obsolete .gdb_index section in %s."),
+ filename);
+ warning_printed = 1;
+ }
+ return 0;
+ }
+ /* Index version 4 uses a different hash function than index version
+ 5 and later.
+
+ Versions earlier than 6 did not emit psymbols for inlined
+ functions. Using these files will cause GDB not to be able to
+ set breakpoints on inlined functions by name, so we ignore these
+ indices unless the user has done
+ "set use-deprecated-index-sections on". */
+ if (version < 6 && !deprecated_ok)
+ {
+ static int warning_printed = 0;
+ if (!warning_printed)
+ {
+ warning (_("\
+Skipping deprecated .gdb_index section in %s.\n\
+Do \"set use-deprecated-index-sections on\" before the file is read\n\
+to use the section anyway."),
+ filename);
+ warning_printed = 1;
+ }
+ return 0;
+ }
+ /* Version 7 indices generated by gold refer to the CU for a symbol instead
+ of the TU (for symbols coming from TUs),
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15021.
+ Plus gold-generated indices can have duplicate entries for global symbols,
+ http://sourceware.org/bugzilla/show_bug.cgi?id=15646.
+ These are just performance bugs, and we can't distinguish gdb-generated
+ indices from gold-generated ones, so issue no warning here. */
+
+ /* Indexes with higher version than the one supported by GDB may be no
+ longer backward compatible. */
+ if (version > 8)
+ return 0;
+
+ map->version = version;
+
+ int i = 1;
+ *cu_list = addr + metadata[i];
+ *cu_list_elements = (metadata[i + 1] - metadata[i]) / 8;
+ ++i;
+
+ *types_list = addr + metadata[i];
+ *types_list_elements = (metadata[i + 1] - metadata[i]) / 8;
+ ++i;
+
+ const gdb_byte *address_table = addr + metadata[i];
+ const gdb_byte *address_table_end = addr + metadata[i + 1];
+ map->address_table
+ = gdb::array_view<const gdb_byte> (address_table, address_table_end);
+ ++i;
+
+ const gdb_byte *symbol_table = addr + metadata[i];
+ const gdb_byte *symbol_table_end = addr + metadata[i + 1];
+ map->symbol_table
+ = offset_view (gdb::array_view<const gdb_byte> (symbol_table,
+ symbol_table_end));
+
+ ++i;
+ map->constant_pool = buffer.slice (metadata[i]);
+
+ if (map->constant_pool.empty () && !map->symbol_table.empty ())
+ {
+ /* An empty constant pool implies that all symbol table entries are
+ empty. Make map->symbol_table.empty () == true. */
+ map->symbol_table
+ = offset_view (gdb::array_view<const gdb_byte> (symbol_table,
+ symbol_table));
+ }
+
+ return 1;
+}
+
+/* A helper for create_cus_from_gdb_index that handles a given list of
+ CUs. */
+
+static void
+create_cus_from_gdb_index_list (dwarf2_per_bfd *per_bfd,
+ const gdb_byte *cu_list, offset_type n_elements,
+ struct dwarf2_section_info *section,
+ int is_dwz)
+{
+ for (offset_type i = 0; i < n_elements; i += 2)
+ {
+ gdb_static_assert (sizeof (ULONGEST) >= 8);
+
+ sect_offset sect_off
+ = (sect_offset) extract_unsigned_integer (cu_list, 8, BFD_ENDIAN_LITTLE);
+ ULONGEST length = extract_unsigned_integer (cu_list + 8, 8, BFD_ENDIAN_LITTLE);
+ cu_list += 2 * 8;
+
+ dwarf2_per_cu_data_up per_cu
+ = create_cu_from_index_list (per_bfd, section, is_dwz, sect_off,
+ length);
+ per_bfd->all_units.push_back (std::move (per_cu));
+ }
+}
+
+/* Read the CU list from the mapped index, and use it to create all
+ the CU objects for PER_BFD. */
+
+static void
+create_cus_from_gdb_index (dwarf2_per_bfd *per_bfd,
+ const gdb_byte *cu_list, offset_type cu_list_elements,
+ const gdb_byte *dwz_list, offset_type dwz_elements)
+{
+ gdb_assert (per_bfd->all_units.empty ());
+ per_bfd->all_units.reserve ((cu_list_elements + dwz_elements) / 2);
+
+ create_cus_from_gdb_index_list (per_bfd, cu_list, cu_list_elements,
+ &per_bfd->info, 0);
+
+ if (dwz_elements == 0)
+ return;
+
+ dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
+ create_cus_from_gdb_index_list (per_bfd, dwz_list, dwz_elements,
+ &dwz->info, 1);
+}
+
+/* Create the signatured type hash table from the index. */
+
+static void
+create_signatured_type_table_from_gdb_index
+ (dwarf2_per_bfd *per_bfd, struct dwarf2_section_info *section,
+ const gdb_byte *bytes, offset_type elements)
+{
+ htab_up sig_types_hash = allocate_signatured_type_table ();
+
+ for (offset_type i = 0; i < elements; i += 3)
+ {
+ signatured_type_up sig_type;
+ ULONGEST signature;
+ void **slot;
+ cu_offset type_offset_in_tu;
+
+ gdb_static_assert (sizeof (ULONGEST) >= 8);
+ sect_offset sect_off
+ = (sect_offset) extract_unsigned_integer (bytes, 8, BFD_ENDIAN_LITTLE);
+ type_offset_in_tu
+ = (cu_offset) extract_unsigned_integer (bytes + 8, 8,
+ BFD_ENDIAN_LITTLE);
+ signature = extract_unsigned_integer (bytes + 16, 8, BFD_ENDIAN_LITTLE);
+ bytes += 3 * 8;
+
+ sig_type = per_bfd->allocate_signatured_type (signature);
+ sig_type->type_offset_in_tu = type_offset_in_tu;
+ sig_type->section = section;
+ sig_type->sect_off = sect_off;
+
+ slot = htab_find_slot (sig_types_hash.get (), sig_type.get (), INSERT);
+ *slot = sig_type.get ();
+
+ per_bfd->all_units.emplace_back (sig_type.release ());
+ }
+
+ per_bfd->signatured_types = std::move (sig_types_hash);
+}
+
+/* Read the address map data from the mapped GDB index, and use it to
+ populate the index_addrmap. */
+
+static void
+create_addrmap_from_gdb_index (dwarf2_per_objfile *per_objfile,
+ mapped_gdb_index *index)
+{
+ struct objfile *objfile = per_objfile->objfile;
+ dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
+ struct gdbarch *gdbarch = objfile->arch ();
+ const gdb_byte *iter, *end;
+ CORE_ADDR baseaddr;
+
+ addrmap_mutable mutable_map;
+
+ iter = index->address_table.data ();
+ end = iter + index->address_table.size ();
+
+ baseaddr = objfile->text_section_offset ();
+
+ while (iter < end)
+ {
+ ULONGEST hi, lo, cu_index;
+ lo = extract_unsigned_integer (iter, 8, BFD_ENDIAN_LITTLE);
+ iter += 8;
+ hi = extract_unsigned_integer (iter, 8, BFD_ENDIAN_LITTLE);
+ iter += 8;
+ cu_index = extract_unsigned_integer (iter, 4, BFD_ENDIAN_LITTLE);
+ iter += 4;
+
+ if (lo > hi)
+ {
+ complaint (_(".gdb_index address table has invalid range (%s - %s)"),
+ hex_string (lo), hex_string (hi));
+ continue;
+ }
+
+ if (cu_index >= per_bfd->all_units.size ())
+ {
+ complaint (_(".gdb_index address table has invalid CU number %u"),
+ (unsigned) cu_index);
+ continue;
+ }
+
+ lo = gdbarch_adjust_dwarf2_addr (gdbarch, lo + baseaddr) - baseaddr;
+ hi = gdbarch_adjust_dwarf2_addr (gdbarch, hi + baseaddr) - baseaddr;
+ mutable_map.set_empty (lo, hi - 1, per_bfd->get_cu (cu_index));
+ }
+
+ per_bfd->index_addrmap
+ = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack, &mutable_map);
+}
+
+/* See read-gdb-index.h. */
+
+int
+dwarf2_read_gdb_index
+ (dwarf2_per_objfile *per_objfile,
+ get_gdb_index_contents_ftype get_gdb_index_contents,
+ get_gdb_index_contents_dwz_ftype get_gdb_index_contents_dwz)
+{
+ const gdb_byte *cu_list, *types_list, *dwz_list = NULL;
+ offset_type cu_list_elements, types_list_elements, dwz_list_elements = 0;
+ struct dwz_file *dwz;
+ struct objfile *objfile = per_objfile->objfile;
+ dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
+
+ gdb::array_view<const gdb_byte> main_index_contents
+ = get_gdb_index_contents (objfile, per_bfd);
+
+ if (main_index_contents.empty ())
+ return 0;
+
+ std::unique_ptr<mapped_gdb_index> map (new mapped_gdb_index);
+ if (!read_gdb_index_from_buffer (objfile_name (objfile),
+ use_deprecated_index_sections,
+ main_index_contents, map.get (), &cu_list,
+ &cu_list_elements, &types_list,
+ &types_list_elements))
+ return 0;
+
+ /* Don't use the index if it's empty. */
+ if (map->symbol_table.empty ())
+ return 0;
+
+ /* If there is a .dwz file, read it so we can get its CU list as
+ well. */
+ dwz = dwarf2_get_dwz_file (per_bfd);
+ if (dwz != NULL)
+ {
+ mapped_gdb_index dwz_map;
+ const gdb_byte *dwz_types_ignore;
+ offset_type dwz_types_elements_ignore;
+
+ gdb::array_view<const gdb_byte> dwz_index_content
+ = get_gdb_index_contents_dwz (objfile, dwz);
+
+ if (dwz_index_content.empty ())
+ return 0;
+
+ if (!read_gdb_index_from_buffer (bfd_get_filename (dwz->dwz_bfd.get ()),
+ 1, dwz_index_content, &dwz_map,
+ &dwz_list, &dwz_list_elements,
+ &dwz_types_ignore,
+ &dwz_types_elements_ignore))
+ {
+ warning (_("could not read '.gdb_index' section from %s; skipping"),
+ bfd_get_filename (dwz->dwz_bfd.get ()));
+ return 0;
+ }
+ }
+
+ create_cus_from_gdb_index (per_bfd, cu_list, cu_list_elements, dwz_list,
+ dwz_list_elements);
+
+ if (types_list_elements)
+ {
+ /* We can only handle a single .debug_types when we have an
+ index. */
+ if (per_bfd->types.size () > 1)
+ {
+ per_bfd->all_units.clear ();
+ return 0;
+ }
+
+ dwarf2_section_info *section
+ = (per_bfd->types.size () == 1
+ ? &per_bfd->types[0]
+ : &per_bfd->info);
+
+ create_signatured_type_table_from_gdb_index (per_bfd, section, types_list,
+ types_list_elements);
+ }
+
+ finalize_all_units (per_bfd);
+
+ create_addrmap_from_gdb_index (per_objfile, map.get ());
+
+ per_bfd->index_table = std::move (map);
+ per_bfd->quick_file_names_table =
+ create_quick_file_names_table (per_bfd->all_units.size ());
+
+ return 1;
+}
+
+void _initialize_read_gdb_index ();
+
+void
+_initialize_read_gdb_index ()
+{
+ add_setshow_boolean_cmd ("use-deprecated-index-sections",
+ no_class, &use_deprecated_index_sections, _("\
+Set whether to use deprecated gdb_index sections."), _("\
+Show whether to use deprecated gdb_index sections."), _("\
+When enabled, deprecated .gdb_index sections are used anyway.\n\
+Normally they are ignored either because of a missing feature or\n\
+performance issue.\n\
+Warning: This option must be enabled before gdb reads the file."),
+ NULL,
+ NULL,
+ &setlist, &showlist);
+}
diff --git a/gdb/dwarf2/read-gdb-index.h b/gdb/dwarf2/read-gdb-index.h
new file mode 100644
index 000000000000..b69de4a8ba7a
--- /dev/null
+++ b/gdb/dwarf2/read-gdb-index.h
@@ -0,0 +1,47 @@
+/* Reading code for .gdb_index
+
+ Copyright (C) 2023 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef DWARF2_READ_GDB_INDEX_H
+#define DWARF2_READ_GDB_INDEX_H
+
+#include "gdbsupport/function-view.h"
+
+struct dwarf2_per_bfd;
+struct dwarf2_per_objfile;
+struct dwz_file;
+struct objfile;
+
+/* Callback types for dwarf2_read_gdb_index. */
+
+typedef gdb::function_view
+ <gdb::array_view<const gdb_byte>(objfile *, dwarf2_per_bfd *)>
+ get_gdb_index_contents_ftype;
+typedef gdb::function_view
+ <gdb::array_view<const gdb_byte>(objfile *, dwz_file *)>
+ get_gdb_index_contents_dwz_ftype;
+
+/* Read .gdb_index. If everything went ok, initialize the "quick"
+ elements of all the CUs and return 1. Otherwise, return 0. */
+
+int dwarf2_read_gdb_index
+ (dwarf2_per_objfile *per_objfile,
+ get_gdb_index_contents_ftype get_gdb_index_contents,
+ get_gdb_index_contents_dwz_ftype get_gdb_index_contents_dwz);
+
+#endif /* DWARF2_READ_GDB_INDEX_H */
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 74856ce4a456..1d6f61a71307 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -41,6 +41,7 @@
#include "dwarf2/dwz.h"
#include "dwarf2/macro.h"
#include "dwarf2/die.h"
+#include "dwarf2/read-gdb-index.h"
#include "dwarf2/sect-names.h"
#include "dwarf2/stringify.h"
#include "dwarf2/public.h"
@@ -120,9 +121,6 @@ unsigned int dwarf_line_debug = 0;
/* When true, cross-check physname against demangler. */
static bool check_physname = false;
-/* When true, do not reject deprecated .gdb_index sections. */
-static bool use_deprecated_index_sections = false;
-
/* This is used to store the data that is always per objfile. */
static const registry<objfile>::key<dwarf2_per_objfile>
dwarf2_objfile_data_key;
@@ -158,62 +156,7 @@ static int dwarf2_loclist_block_index;
/* Size of .debug_rnglists section header for 64-bit DWARF format. */
#define RNGLIST_HEADER_SIZE64 20
-/* A description of .gdb_index index. The file format is described in
- a comment by the code that writes the index. */
-
-struct mapped_gdb_index final : public mapped_index_base
-{
- /* Index data format version. */
- int version = 0;
-
- /* The address table data. */
- gdb::array_view<const gdb_byte> address_table;
-
- /* The symbol table, implemented as a hash table. */
- offset_view symbol_table;
-
- /* A pointer to the constant pool. */
- gdb::array_view<const gdb_byte> constant_pool;
-
- /* Return the index into the constant pool of the name of the IDXth
- symbol in the symbol table. */
- offset_type symbol_name_index (offset_type idx) const
- {
- return symbol_table[2 * idx];
- }
-
- /* Return the index into the constant pool of the CU vector of the
- IDXth symbol in the symbol table. */
- offset_type symbol_vec_index (offset_type idx) const
- {
- return symbol_table[2 * idx + 1];
- }
-
- bool symbol_name_slot_invalid (offset_type idx) const override
- {
- return (symbol_name_index (idx) == 0
- && symbol_vec_index (idx) == 0);
- }
-
- /* Convenience method to get at the name of the symbol at IDX in the
- symbol table. */
- const char *symbol_name_at
- (offset_type idx, dwarf2_per_objfile *per_objfile) const override
- {
- return (const char *) (this->constant_pool.data ()
- + symbol_name_index (idx));
- }
-
- size_t symbol_name_count () const override
- { return this->symbol_table.size () / 2; }
-
- quick_symbol_functions_up make_quick_functions () const override;
- bool version_check () const override
- {
- return version >= 8;
- }
-};
/* A description of the mapped .debug_names.
Uninitialized map has CU_COUNT 0. */
@@ -1723,28 +1666,6 @@ struct readnow_functions : public dwarf2_base_index_functions
}
};
-struct dwarf2_gdb_index : public dwarf2_base_index_functions
-{
- void dump (struct objfile *objfile) override;
-
- void expand_matching_symbols
- (struct objfile *,
- const lookup_name_info &lookup_name,
- domain_enum domain,
- int global,
- symbol_compare_ftype *ordered_compare) override;
-
- bool expand_symtabs_matching
- (struct objfile *objfile,
- gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
- const lookup_name_info *lookup_name,
- gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
- gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
- block_search_flags search_flags,
- domain_enum domain,
- enum search_domain kind) override;
-};
-
struct dwarf2_debug_names_index : public dwarf2_base_index_functions
{
void dump (struct objfile *objfile) override;
@@ -1767,12 +1688,6 @@ struct dwarf2_debug_names_index : public dwarf2_base_index_functions
enum search_domain kind) override;
};
-quick_symbol_functions_up
-mapped_gdb_index::make_quick_functions () const
-{
- return quick_symbol_functions_up (new dwarf2_gdb_index);
-}
-
quick_symbol_functions_up
mapped_debug_names::make_quick_functions () const
{
@@ -1945,10 +1860,9 @@ dwarf2_per_bfd::allocate_signatured_type (ULONGEST signature)
return result;
}
-/* Return a new dwarf2_per_cu_data allocated on the per-bfd
- obstack, and constructed with the specified field values. */
+/* See read.h. */
-static dwarf2_per_cu_data_up
+dwarf2_per_cu_data_up
create_cu_from_index_list (dwarf2_per_bfd *per_bfd,
struct dwarf2_section_info *section,
int is_dwz,
@@ -1962,92 +1876,6 @@ create_cu_from_index_list (dwarf2_per_bfd *per_bfd,
return the_cu;
}
-/* A helper for create_cus_from_index that handles a given list of
- CUs. */
-
-static void
-create_cus_from_gdb_index_list (dwarf2_per_bfd *per_bfd,
- const gdb_byte *cu_list, offset_type n_elements,
- struct dwarf2_section_info *section,
- int is_dwz)
-{
- for (offset_type i = 0; i < n_elements; i += 2)
- {
- gdb_static_assert (sizeof (ULONGEST) >= 8);
-
- sect_offset sect_off
- = (sect_offset) extract_unsigned_integer (cu_list, 8, BFD_ENDIAN_LITTLE);
- ULONGEST length = extract_unsigned_integer (cu_list + 8, 8, BFD_ENDIAN_LITTLE);
- cu_list += 2 * 8;
-
- dwarf2_per_cu_data_up per_cu
- = create_cu_from_index_list (per_bfd, section, is_dwz, sect_off,
- length);
- per_bfd->all_units.push_back (std::move (per_cu));
- }
-}
-
-/* Read the CU list from the mapped index, and use it to create all
- the CU objects for PER_BFD. */
-
-static void
-create_cus_from_gdb_index (dwarf2_per_bfd *per_bfd,
- const gdb_byte *cu_list, offset_type cu_list_elements,
- const gdb_byte *dwz_list, offset_type dwz_elements)
-{
- gdb_assert (per_bfd->all_units.empty ());
- per_bfd->all_units.reserve ((cu_list_elements + dwz_elements) / 2);
-
- create_cus_from_gdb_index_list (per_bfd, cu_list, cu_list_elements,
- &per_bfd->info, 0);
-
- if (dwz_elements == 0)
- return;
-
- dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
- create_cus_from_gdb_index_list (per_bfd, dwz_list, dwz_elements,
- &dwz->info, 1);
-}
-
-/* Create the signatured type hash table from the index. */
-
-static void
-create_signatured_type_table_from_gdb_index
- (dwarf2_per_bfd *per_bfd, struct dwarf2_section_info *section,
- const gdb_byte *bytes, offset_type elements)
-{
- htab_up sig_types_hash = allocate_signatured_type_table ();
-
- for (offset_type i = 0; i < elements; i += 3)
- {
- signatured_type_up sig_type;
- ULONGEST signature;
- void **slot;
- cu_offset type_offset_in_tu;
-
- gdb_static_assert (sizeof (ULONGEST) >= 8);
- sect_offset sect_off
- = (sect_offset) extract_unsigned_integer (bytes, 8, BFD_ENDIAN_LITTLE);
- type_offset_in_tu
- = (cu_offset) extract_unsigned_integer (bytes + 8, 8,
- BFD_ENDIAN_LITTLE);
- signature = extract_unsigned_integer (bytes + 16, 8, BFD_ENDIAN_LITTLE);
- bytes += 3 * 8;
-
- sig_type = per_bfd->allocate_signatured_type (signature);
- sig_type->type_offset_in_tu = type_offset_in_tu;
- sig_type->section = section;
- sig_type->sect_off = sect_off;
-
- slot = htab_find_slot (sig_types_hash.get (), sig_type.get (), INSERT);
- *slot = sig_type.get ();
-
- per_bfd->all_units.emplace_back (sig_type.release ());
- }
-
- per_bfd->signatured_types = std::move (sig_types_hash);
-}
-
/* Create the signatured type hash table from .debug_names. */
static void
@@ -2096,59 +1924,6 @@ create_signatured_type_table_from_debug_names
per_objfile->per_bfd->signatured_types = std::move (sig_types_hash);
}
-/* Read the address map data from the mapped GDB index, and use it to
- populate the index_addrmap. */
-
-static void
-create_addrmap_from_gdb_index (dwarf2_per_objfile *per_objfile,
- mapped_gdb_index *index)
-{
- struct objfile *objfile = per_objfile->objfile;
- dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
- struct gdbarch *gdbarch = objfile->arch ();
- const gdb_byte *iter, *end;
- CORE_ADDR baseaddr;
-
- addrmap_mutable mutable_map;
-
- iter = index->address_table.data ();
- end = iter + index->address_table.size ();
-
- baseaddr = objfile->text_section_offset ();
-
- while (iter < end)
- {
- ULONGEST hi, lo, cu_index;
- lo = extract_unsigned_integer (iter, 8, BFD_ENDIAN_LITTLE);
- iter += 8;
- hi = extract_unsigned_integer (iter, 8, BFD_ENDIAN_LITTLE);
- iter += 8;
- cu_index = extract_unsigned_integer (iter, 4, BFD_ENDIAN_LITTLE);
- iter += 4;
-
- if (lo > hi)
- {
- complaint (_(".gdb_index address table has invalid range (%s - %s)"),
- hex_string (lo), hex_string (hi));
- continue;
- }
-
- if (cu_index >= per_bfd->all_units.size ())
- {
- complaint (_(".gdb_index address table has invalid CU number %u"),
- (unsigned) cu_index);
- continue;
- }
-
- lo = gdbarch_adjust_dwarf2_addr (gdbarch, lo + baseaddr) - baseaddr;
- hi = gdbarch_adjust_dwarf2_addr (gdbarch, hi + baseaddr) - baseaddr;
- mutable_map.set_empty (lo, hi - 1, per_bfd->get_cu (cu_index));
- }
-
- per_bfd->index_addrmap
- = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack, &mutable_map);
-}
-
/* Read the address map data from DWARF-5 .debug_aranges, and use it
to populate given addrmap. Returns true on success, false on
failure. */
@@ -2349,222 +2124,6 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
&mutable_map);
}
-/* A helper function that reads the .gdb_index from BUFFER and fills
- in MAP. FILENAME is the name of the file containing the data;
- it is used for error reporting. DEPRECATED_OK is true if it is
- ok to use deprecated sections.
-
- CU_LIST, CU_LIST_ELEMENTS, TYPES_LIST, and TYPES_LIST_ELEMENTS are
- out parameters that are filled in with information about the CU and
- TU lists in the section.
-
- Returns true if all went well, false otherwise. */
-
-static bool
-read_gdb_index_from_buffer (const char *filename,
- bool deprecated_ok,
- gdb::array_view<const gdb_byte> buffer,
- mapped_gdb_index *map,
- const gdb_byte **cu_list,
- offset_type *cu_list_elements,
- const gdb_byte **types_list,
- offset_type *types_list_elements)
-{
- const gdb_byte *addr = &buffer[0];
- offset_view metadata (buffer);
-
- /* Version check. */
- offset_type version = metadata[0];
- /* Versions earlier than 3 emitted every copy of a psymbol. This
- causes the index to behave very poorly for certain requests. Version 3
- contained incomplete addrmap. So, it seems better to just ignore such
- indices. */
- if (version < 4)
- {
- static int warning_printed = 0;
- if (!warning_printed)
- {
- warning (_("Skipping obsolete .gdb_index section in %s."),
- filename);
- warning_printed = 1;
- }
- return 0;
- }
- /* Index version 4 uses a different hash function than index version
- 5 and later.
-
- Versions earlier than 6 did not emit psymbols for inlined
- functions. Using these files will cause GDB not to be able to
- set breakpoints on inlined functions by name, so we ignore these
- indices unless the user has done
- "set use-deprecated-index-sections on". */
- if (version < 6 && !deprecated_ok)
- {
- static int warning_printed = 0;
- if (!warning_printed)
- {
- warning (_("\
-Skipping deprecated .gdb_index section in %s.\n\
-Do \"set use-deprecated-index-sections on\" before the file is read\n\
-to use the section anyway."),
- filename);
- warning_printed = 1;
- }
- return 0;
- }
- /* Version 7 indices generated by gold refer to the CU for a symbol instead
- of the TU (for symbols coming from TUs),
- http://sourceware.org/bugzilla/show_bug.cgi?id=15021.
- Plus gold-generated indices can have duplicate entries for global symbols,
- http://sourceware.org/bugzilla/show_bug.cgi?id=15646.
- These are just performance bugs, and we can't distinguish gdb-generated
- indices from gold-generated ones, so issue no warning here. */
-
- /* Indexes with higher version than the one supported by GDB may be no
- longer backward compatible. */
- if (version > 8)
- return 0;
-
- map->version = version;
-
- int i = 1;
- *cu_list = addr + metadata[i];
- *cu_list_elements = (metadata[i + 1] - metadata[i]) / 8;
- ++i;
-
- *types_list = addr + metadata[i];
- *types_list_elements = (metadata[i + 1] - metadata[i]) / 8;
- ++i;
-
- const gdb_byte *address_table = addr + metadata[i];
- const gdb_byte *address_table_end = addr + metadata[i + 1];
- map->address_table
- = gdb::array_view<const gdb_byte> (address_table, address_table_end);
- ++i;
-
- const gdb_byte *symbol_table = addr + metadata[i];
- const gdb_byte *symbol_table_end = addr + metadata[i + 1];
- map->symbol_table
- = offset_view (gdb::array_view<const gdb_byte> (symbol_table,
- symbol_table_end));
-
- ++i;
- map->constant_pool = buffer.slice (metadata[i]);
-
- if (map->constant_pool.empty () && !map->symbol_table.empty ())
- {
- /* An empty constant pool implies that all symbol table entries are
- empty. Make map->symbol_table.empty () == true. */
- map->symbol_table
- = offset_view (gdb::array_view<const gdb_byte> (symbol_table,
- symbol_table));
- }
-
- return 1;
-}
-
-/* Callback types for dwarf2_read_gdb_index. */
-
-typedef gdb::function_view
- <gdb::array_view<const gdb_byte>(objfile *, dwarf2_per_bfd *)>
- get_gdb_index_contents_ftype;
-typedef gdb::function_view
- <gdb::array_view<const gdb_byte>(objfile *, dwz_file *)>
- get_gdb_index_contents_dwz_ftype;
-
-/* Read .gdb_index. If everything went ok, initialize the "quick"
- elements of all the CUs and return 1. Otherwise, return 0. */
-
-static int
-dwarf2_read_gdb_index
- (dwarf2_per_objfile *per_objfile,
- get_gdb_index_contents_ftype get_gdb_index_contents,
- get_gdb_index_contents_dwz_ftype get_gdb_index_contents_dwz)
-{
- const gdb_byte *cu_list, *types_list, *dwz_list = NULL;
- offset_type cu_list_elements, types_list_elements, dwz_list_elements = 0;
- struct dwz_file *dwz;
- struct objfile *objfile = per_objfile->objfile;
- dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
-
- gdb::array_view<const gdb_byte> main_index_contents
- = get_gdb_index_contents (objfile, per_bfd);
-
- if (main_index_contents.empty ())
- return 0;
-
- std::unique_ptr<mapped_gdb_index> map (new mapped_gdb_index);
- if (!read_gdb_index_from_buffer (objfile_name (objfile),
- use_deprecated_index_sections,
- main_index_contents, map.get (), &cu_list,
- &cu_list_elements, &types_list,
- &types_list_elements))
- return 0;
-
- /* Don't use the index if it's empty. */
- if (map->symbol_table.empty ())
- return 0;
-
- /* If there is a .dwz file, read it so we can get its CU list as
- well. */
- dwz = dwarf2_get_dwz_file (per_bfd);
- if (dwz != NULL)
- {
- mapped_gdb_index dwz_map;
- const gdb_byte *dwz_types_ignore;
- offset_type dwz_types_elements_ignore;
-
- gdb::array_view<const gdb_byte> dwz_index_content
- = get_gdb_index_contents_dwz (objfile, dwz);
-
- if (dwz_index_content.empty ())
- return 0;
-
- if (!read_gdb_index_from_buffer (bfd_get_filename (dwz->dwz_bfd.get ()),
- 1, dwz_index_content, &dwz_map,
- &dwz_list, &dwz_list_elements,
- &dwz_types_ignore,
- &dwz_types_elements_ignore))
- {
- warning (_("could not read '.gdb_index' section from %s; skipping"),
- bfd_get_filename (dwz->dwz_bfd.get ()));
- return 0;
- }
- }
-
- create_cus_from_gdb_index (per_bfd, cu_list, cu_list_elements, dwz_list,
- dwz_list_elements);
-
- if (types_list_elements)
- {
- /* We can only handle a single .debug_types when we have an
- index. */
- if (per_bfd->types.size () > 1)
- {
- per_bfd->all_units.clear ();
- return 0;
- }
-
- dwarf2_section_info *section
- = (per_bfd->types.size () == 1
- ? &per_bfd->types[0]
- : &per_bfd->info);
-
- create_signatured_type_table_from_gdb_index (per_bfd, section, types_list,
- types_list_elements);
- }
-
- finalize_all_units (per_bfd);
-
- create_addrmap_from_gdb_index (per_objfile, map.get ());
-
- per_bfd->index_table = std::move (map);
- per_bfd->quick_file_names_table =
- create_quick_file_names_table (per_bfd->all_units.size ());
-
- return 1;
-}
-
/* die_reader_func for dw2_get_file_names. */
static void
@@ -2756,150 +2315,6 @@ dwarf2_base_index_functions::forget_cached_source_info
per_cu->free_cached_file_names ();
}
-/* Struct used to manage iterating over all CUs looking for a symbol. */
-
-struct dw2_symtab_iterator
-{
- /* The dwarf2_per_objfile owning the CUs we are iterating on. */
- dwarf2_per_objfile *per_objfile;
- /* If set, only look for symbols that match that block. Valid values are
- GLOBAL_BLOCK and STATIC_BLOCK. */
- gdb::optional<block_enum> block_index;
- /* The kind of symbol we're looking for. */
- domain_enum domain;
- /* The list of CUs from the index entry of the symbol,
- or NULL if not found. */
- offset_view vec;
- /* The next element in VEC to look at. */
- int next;
- /* The number of elements in VEC, or zero if there is no match. */
- int length;
- /* Have we seen a global version of the symbol?
- If so we can ignore all further global instances.
- This is to work around gold/15646, inefficient gold-generated
- indices. */
- int global_seen;
-};
-
-/* Initialize the index symtab iterator ITER, offset_type NAMEI variant. */
-
-static void
-dw2_symtab_iter_init (struct dw2_symtab_iterator *iter,
- dwarf2_per_objfile *per_objfile,
- gdb::optional<block_enum> block_index,
- domain_enum domain, offset_type namei,
- mapped_gdb_index &index)
-{
- iter->per_objfile = per_objfile;
- iter->block_index = block_index;
- iter->domain = domain;
- iter->next = 0;
- iter->global_seen = 0;
- iter->vec = {};
- iter->length = 0;
-
- gdb_assert (!index.symbol_name_slot_invalid (namei));
- offset_type vec_idx = index.symbol_vec_index (namei);
-
- iter->vec = offset_view (index.constant_pool.slice (vec_idx));
- iter->length = iter->vec[0];
-}
-
-/* Return the next matching CU or NULL if there are no more. */
-
-static struct dwarf2_per_cu_data *
-dw2_symtab_iter_next (struct dw2_symtab_iterator *iter,
- mapped_gdb_index &index)
-{
- dwarf2_per_objfile *per_objfile = iter->per_objfile;
-
- for ( ; iter->next < iter->length; ++iter->next)
- {
- offset_type cu_index_and_attrs = iter->vec[iter->next + 1];
- offset_type cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs);
- gdb_index_symbol_kind symbol_kind =
- GDB_INDEX_SYMBOL_KIND_VALUE (cu_index_and_attrs);
- /* Only check the symbol attributes if they're present.
- Indices prior to version 7 don't record them,
- and indices >= 7 may elide them for certain symbols
- (gold does this). */
- int attrs_valid = (index.version >= 7
- && symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
-
- /* Don't crash on bad data. */
- if (cu_index >= per_objfile->per_bfd->all_units.size ())
- {
- complaint (_(".gdb_index entry has bad CU index"
- " [in module %s]"), objfile_name (per_objfile->objfile));
- continue;
- }
-
- dwarf2_per_cu_data *per_cu = per_objfile->per_bfd->get_cu (cu_index);
-
- /* Skip if already read in. */
- if (per_objfile->symtab_set_p (per_cu))
- continue;
-
- /* Check static vs global. */
- if (attrs_valid)
- {
- bool is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
-
- if (iter->block_index.has_value ())
- {
- bool want_static = *iter->block_index == STATIC_BLOCK;
-
- if (is_static != want_static)
- continue;
- }
-
- /* Work around gold/15646. */
- if (!is_static
- && symbol_kind == GDB_INDEX_SYMBOL_KIND_TYPE)
- {
- if (iter->global_seen)
- continue;
-
- iter->global_seen = 1;
- }
- }
-
- /* Only check the symbol's kind if it has one. */
- if (attrs_valid)
- {
- switch (iter->domain)
- {
- case VAR_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_VARIABLE
- && symbol_kind != GDB_INDEX_SYMBOL_KIND_FUNCTION
- /* Some types are also in VAR_DOMAIN. */
- && symbol_kind != GDB_INDEX_SYMBOL_KIND_TYPE)
- continue;
- break;
- case STRUCT_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_TYPE)
- continue;
- break;
- case LABEL_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_OTHER)
- continue;
- break;
- case MODULE_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_OTHER)
- continue;
- break;
- default:
- break;
- }
- }
-
- ++iter->next;
- return per_cu;
- }
-
- return NULL;
-}
-
void
dwarf2_base_index_functions::print_stats (struct objfile *objfile,
bool print_bcache)
@@ -2922,22 +2337,6 @@ dwarf2_base_index_functions::print_stats (struct objfile *objfile,
gdb_printf (_(" Number of unread CUs: %d\n"), count);
}
-/* This dumps minimal information about the index.
- It is called via "mt print objfiles".
- One use is to verify .gdb_index has been loaded by the
- gdb.dwarf2/gdb-index.exp testcase. */
-
-void
-dwarf2_gdb_index::dump (struct objfile *objfile)
-{
- dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
-
- mapped_gdb_index *index = (gdb::checked_static_cast<mapped_gdb_index *>
- (per_objfile->per_bfd->index_table.get ()));
- gdb_printf (".gdb_index: version %d\n", index->version);
- gdb_printf ("\n");
-}
-
void
dwarf2_base_index_functions::expand_all_symtabs (struct objfile *objfile)
{
@@ -2957,44 +2356,6 @@ dwarf2_base_index_functions::expand_all_symtabs (struct objfile *objfile)
}
}
-void
-dwarf2_gdb_index::expand_matching_symbols
- (struct objfile *objfile,
- const lookup_name_info &name, domain_enum domain,
- int global,
- symbol_compare_ftype *ordered_compare)
-{
- /* Used for Ada. */
- dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
-
- const block_enum block_kind = global ? GLOBAL_BLOCK : STATIC_BLOCK;
-
- mapped_gdb_index &index
- = *(gdb::checked_static_cast<mapped_gdb_index *>
- (per_objfile->per_bfd->index_table.get ()));
-
- const char *match_name = name.ada ().lookup_name ().c_str ();
- auto matcher = [&] (const char *symname)
- {
- if (ordered_compare == nullptr)
- return true;
- return ordered_compare (symname, match_name) == 0;
- };
-
- dw2_expand_symtabs_matching_symbol (index, name, matcher,
- [&] (offset_type namei)
- {
- struct dw2_symtab_iterator iter;
- struct dwarf2_per_cu_data *per_cu;
-
- dw2_symtab_iter_init (&iter, per_objfile, block_kind, domain, namei,
- index);
- while ((per_cu = dw2_symtab_iter_next (&iter, index)) != NULL)
- dw2_expand_symtabs_matching_one (per_cu, per_objfile, nullptr,
- nullptr);
- return true;
- }, per_objfile);
-}
/* Starting from a search name, return the string that finds the upper
bound of all strings that start with SEARCH_NAME in a sorted name
@@ -3797,107 +3158,6 @@ dw2_expand_symtabs_matching_one
return true;
}
-/* Helper for dw2_expand_matching symtabs. Called on each symbol
- matched, to expand corresponding CUs that were marked. IDX is the
- index of the symbol name that matched. */
-
-static bool
-dw2_expand_marked_cus
- (dwarf2_per_objfile *per_objfile, offset_type idx,
- gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
- gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
- block_search_flags search_flags,
- search_domain kind)
-{
- offset_type vec_len, vec_idx;
- bool global_seen = false;
- mapped_gdb_index &index
- = *(gdb::checked_static_cast<mapped_gdb_index *>
- (per_objfile->per_bfd->index_table.get ()));
-
- offset_view vec (index.constant_pool.slice (index.symbol_vec_index (idx)));
- vec_len = vec[0];
- for (vec_idx = 0; vec_idx < vec_len; ++vec_idx)
- {
- offset_type cu_index_and_attrs = vec[vec_idx + 1];
- /* This value is only valid for index versions >= 7. */
- int is_static = GDB_INDEX_SYMBOL_STATIC_VALUE (cu_index_and_attrs);
- gdb_index_symbol_kind symbol_kind =
- GDB_INDEX_SYMBOL_KIND_VALUE (cu_index_and_attrs);
- int cu_index = GDB_INDEX_CU_VALUE (cu_index_and_attrs);
- /* Only check the symbol attributes if they're present.
- Indices prior to version 7 don't record them,
- and indices >= 7 may elide them for certain symbols
- (gold does this). */
- int attrs_valid =
- (index.version >= 7
- && symbol_kind != GDB_INDEX_SYMBOL_KIND_NONE);
-
- /* Work around gold/15646. */
- if (attrs_valid
- && !is_static
- && symbol_kind == GDB_INDEX_SYMBOL_KIND_TYPE)
- {
- if (global_seen)
- continue;
-
- global_seen = true;
- }
-
- /* Only check the symbol's kind if it has one. */
- if (attrs_valid)
- {
- if (is_static)
- {
- if ((search_flags & SEARCH_STATIC_BLOCK) == 0)
- continue;
- }
- else
- {
- if ((search_flags & SEARCH_GLOBAL_BLOCK) == 0)
- continue;
- }
-
- switch (kind)
- {
- case VARIABLES_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_VARIABLE)
- continue;
- break;
- case FUNCTIONS_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_FUNCTION)
- continue;
- break;
- case TYPES_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_TYPE)
- continue;
- break;
- case MODULES_DOMAIN:
- if (symbol_kind != GDB_INDEX_SYMBOL_KIND_OTHER)
- continue;
- break;
- default:
- break;
- }
- }
-
- /* Don't crash on bad data. */
- if (cu_index >= per_objfile->per_bfd->all_units.size ())
- {
- complaint (_(".gdb_index entry has bad CU index"
- " [in module %s]"), objfile_name (per_objfile->objfile));
- continue;
- }
-
- dwarf2_per_cu_data *per_cu = per_objfile->per_bfd->get_cu (cu_index);
- if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile, file_matcher,
- expansion_notify))
- return false;
- }
-
- return true;
-}
-
/* See read.h. */
void
@@ -3997,55 +3257,6 @@ dw_expand_symtabs_matching_file_matcher
}
}
-bool
-dwarf2_gdb_index::expand_symtabs_matching
- (struct objfile *objfile,
- gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
- const lookup_name_info *lookup_name,
- gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
- gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
- block_search_flags search_flags,
- domain_enum domain,
- enum search_domain kind)
-{
- dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
-
- dw_expand_symtabs_matching_file_matcher (per_objfile, file_matcher);
-
- /* This invariant is documented in quick-functions.h. */
- gdb_assert (lookup_name != nullptr || symbol_matcher == nullptr);
- if (lookup_name == nullptr)
- {
- for (dwarf2_per_cu_data *per_cu
- : all_units_range (per_objfile->per_bfd))
- {
- QUIT;
-
- if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
- file_matcher,
- expansion_notify))
- return false;
- }
- return true;
- }
-
- mapped_gdb_index &index
- = *(gdb::checked_static_cast<mapped_gdb_index *>
- (per_objfile->per_bfd->index_table.get ()));
-
- bool result
- = dw2_expand_symtabs_matching_symbol (index, *lookup_name,
- symbol_matcher,
- [&] (offset_type idx)
- {
- if (!dw2_expand_marked_cus (per_objfile, idx, file_matcher,
- expansion_notify, search_flags, kind))
- return false;
- return true;
- }, per_objfile);
-
- return result;
-}
/* A helper for dw2_find_pc_sect_compunit_symtab which finds the most specific
symtab. */
@@ -23738,18 +22949,6 @@ the demangler."),
NULL, show_check_physname,
&setdebuglist, &showdebuglist);
- add_setshow_boolean_cmd ("use-deprecated-index-sections",
- no_class, &use_deprecated_index_sections, _("\
-Set whether to use deprecated gdb_index sections."), _("\
-Show whether to use deprecated gdb_index sections."), _("\
-When enabled, deprecated .gdb_index sections are used anyway.\n\
-Normally they are ignored either because of a missing feature or\n\
-performance issue.\n\
-Warning: This option must be enabled before gdb reads the file."),
- NULL,
- NULL,
- &setlist, &showlist);
-
dwarf2_locexpr_index = register_symbol_computed_impl (LOC_COMPUTED,
&dwarf2_locexpr_funcs);
dwarf2_loclist_index = register_symbol_computed_impl (LOC_COMPUTED,
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 476905c23737..b0e3020e50de 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -962,6 +962,15 @@ const char *read_indirect_string_at_offset
htab_up allocate_signatured_type_table ();
+/* Return a new dwarf2_per_cu_data allocated on the per-bfd
+ obstack, and constructed with the specified field values. */
+
+dwarf2_per_cu_data_up
+create_cu_from_index_list (dwarf2_per_bfd *per_bfd,
+ struct dwarf2_section_info *section,
+ int is_dwz,
+ sect_offset sect_off, ULONGEST length);
+
/* Initialize the views on all_units. */
void finalize_all_units (dwarf2_per_bfd *per_bfd);
--
2.39.1
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 4/4] gdb/dwarf2: split .debug_names reading code to own file
2023-02-13 14:55 [PATCH 0/4] Move index reading code out of dwarf2/read.c Simon Marchi
` (2 preceding siblings ...)
2023-02-13 14:55 ` [PATCH 3/4] gdb/dwarf2: split .gdb_index reading code to own file Simon Marchi
@ 2023-02-13 14:55 ` Simon Marchi
2023-02-13 23:38 ` Tom Tromey
3 siblings, 1 reply; 13+ messages in thread
From: Simon Marchi @ 2023-02-13 14:55 UTC (permalink / raw)
To: gdb-patches; +Cc: Simon Marchi
Move everything related to reading .debug_names from read.c to
read-debug-names.c. The only entry point exposed by
read-debug-names.{c,h} is dwarf2_read_debug_names.
Change-Id: I18b23f3c7a61b14abc3a46e4bf559bc2d078e8bc
---
gdb/Makefile.in | 2 +
gdb/dwarf2/read-debug-names.c | 1052 +++++++++++++++++++++++++++++++++
gdb/dwarf2/read-debug-names.h | 30 +
gdb/dwarf2/read.c | 1035 +-------------------------------
gdb/dwarf2/read.h | 8 +
5 files changed, 1096 insertions(+), 1031 deletions(-)
create mode 100644 gdb/dwarf2/read-debug-names.c
create mode 100644 gdb/dwarf2/read-debug-names.h
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 5a0b3c856d30..ace507cded80 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1082,6 +1082,7 @@ COMMON_SFILES = \
dwarf2/loc.c \
dwarf2/macro.c \
dwarf2/read.c \
+ dwarf2/read-debug-names.c \
dwarf2/read-gdb-index.c \
dwarf2/section.c \
dwarf2/stringify.c \
@@ -1326,6 +1327,7 @@ HFILES_NO_SRCDIR = \
dwarf2/index-common.h \
dwarf2/loc.h \
dwarf2/read.h \
+ dwarf2/read-debug-names.h \
dwarf2/read-gdb-index.h \
event-top.h \
exceptions.h \
diff --git a/gdb/dwarf2/read-debug-names.c b/gdb/dwarf2/read-debug-names.c
new file mode 100644
index 000000000000..3d96bf476f80
--- /dev/null
+++ b/gdb/dwarf2/read-debug-names.c
@@ -0,0 +1,1052 @@
+/* Reading code for .debug_names
+
+ Copyright (C) 2023 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#include "defs.h"
+#include "read-debug-names.h"
+
+#include "complaints.h"
+#include "cp-support.h"
+#include "dwz.h"
+#include "mapped-index.h"
+#include "read.h"
+#include "stringify.h"
+
+/* A description of the mapped .debug_names.
+ Uninitialized map has CU_COUNT 0. */
+
+struct mapped_debug_names final : public mapped_index_base
+{
+ bfd_endian dwarf5_byte_order;
+ bool dwarf5_is_dwarf64;
+ bool augmentation_is_gdb;
+ uint8_t offset_size;
+ uint32_t cu_count = 0;
+ uint32_t tu_count, bucket_count, name_count;
+ const gdb_byte *cu_table_reordered, *tu_table_reordered;
+ const uint32_t *bucket_table_reordered, *hash_table_reordered;
+ const gdb_byte *name_table_string_offs_reordered;
+ const gdb_byte *name_table_entry_offs_reordered;
+ const gdb_byte *entry_pool;
+
+ struct index_val
+ {
+ ULONGEST dwarf_tag;
+ struct attr
+ {
+ /* Attribute name DW_IDX_*. */
+ ULONGEST dw_idx;
+
+ /* Attribute form DW_FORM_*. */
+ ULONGEST form;
+
+ /* Value if FORM is DW_FORM_implicit_const. */
+ LONGEST implicit_const;
+ };
+ std::vector<attr> attr_vec;
+ };
+
+ std::unordered_map<ULONGEST, index_val> abbrev_map;
+
+ const char *namei_to_name
+ (uint32_t namei, dwarf2_per_objfile *per_objfile) const;
+
+ /* Implementation of the mapped_index_base virtual interface, for
+ the name_components cache. */
+
+ const char *symbol_name_at
+ (offset_type idx, dwarf2_per_objfile *per_objfile) const override
+ { return namei_to_name (idx, per_objfile); }
+
+ size_t symbol_name_count () const override
+ { return this->name_count; }
+
+ quick_symbol_functions_up make_quick_functions () const override;
+};
+
+struct dwarf2_debug_names_index : public dwarf2_base_index_functions
+{
+ void dump (struct objfile *objfile) override;
+
+ void expand_matching_symbols
+ (struct objfile *,
+ const lookup_name_info &lookup_name,
+ domain_enum domain,
+ int global,
+ symbol_compare_ftype *ordered_compare) override;
+
+ bool expand_symtabs_matching
+ (struct objfile *objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info *lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ block_search_flags search_flags,
+ domain_enum domain,
+ enum search_domain kind) override;
+};
+
+quick_symbol_functions_up
+mapped_debug_names::make_quick_functions () const
+{
+ return quick_symbol_functions_up (new dwarf2_debug_names_index);
+}
+
+/* Create the signatured type hash table from .debug_names. */
+
+static void
+create_signatured_type_table_from_debug_names
+ (dwarf2_per_objfile *per_objfile,
+ const mapped_debug_names &map,
+ struct dwarf2_section_info *section,
+ struct dwarf2_section_info *abbrev_section)
+{
+ struct objfile *objfile = per_objfile->objfile;
+
+ section->read (objfile);
+ abbrev_section->read (objfile);
+
+ htab_up sig_types_hash = allocate_signatured_type_table ();
+
+ for (uint32_t i = 0; i < map.tu_count; ++i)
+ {
+ signatured_type_up sig_type;
+ void **slot;
+
+ sect_offset sect_off
+ = (sect_offset) (extract_unsigned_integer
+ (map.tu_table_reordered + i * map.offset_size,
+ map.offset_size,
+ map.dwarf5_byte_order));
+
+ comp_unit_head cu_header;
+ read_and_check_comp_unit_head (per_objfile, &cu_header, section,
+ abbrev_section,
+ section->buffer + to_underlying (sect_off),
+ rcuh_kind::TYPE);
+
+ sig_type = per_objfile->per_bfd->allocate_signatured_type
+ (cu_header.signature);
+ sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
+ sig_type->section = section;
+ sig_type->sect_off = sect_off;
+
+ slot = htab_find_slot (sig_types_hash.get (), sig_type.get (), INSERT);
+ *slot = sig_type.get ();
+
+ per_objfile->per_bfd->all_units.emplace_back (sig_type.release ());
+ }
+
+ per_objfile->per_bfd->signatured_types = std::move (sig_types_hash);
+}
+
+/* Read the address map data from DWARF-5 .debug_aranges, and use it to
+ populate the index_addrmap. */
+
+static void
+create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
+ struct dwarf2_section_info *section)
+{
+ dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
+
+ addrmap_mutable mutable_map;
+
+ if (read_addrmap_from_aranges (per_objfile, section, &mutable_map))
+ per_bfd->index_addrmap
+ = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack,
+ &mutable_map);
+}
+
+/* DWARF-5 debug_names reader. */
+
+/* DWARF-5 augmentation string for GDB's DW_IDX_GNU_* extension. */
+static const gdb_byte dwarf5_augmentation[] = { 'G', 'D', 'B', 0 };
+
+/* A helper function that reads the .debug_names section in SECTION
+ and fills in MAP. FILENAME is the name of the file containing the
+ section; it is used for error reporting.
+
+ Returns true if all went well, false otherwise. */
+
+static bool
+read_debug_names_from_section (struct objfile *objfile,
+ const char *filename,
+ struct dwarf2_section_info *section,
+ mapped_debug_names &map)
+{
+ if (section->empty ())
+ return false;
+
+ /* Older elfutils strip versions could keep the section in the main
+ executable while splitting it for the separate debug info file. */
+ if ((section->get_flags () & SEC_HAS_CONTENTS) == 0)
+ return false;
+
+ section->read (objfile);
+
+ map.dwarf5_byte_order = gdbarch_byte_order (objfile->arch ());
+
+ const gdb_byte *addr = section->buffer;
+
+ bfd *const abfd = section->get_bfd_owner ();
+
+ unsigned int bytes_read;
+ LONGEST length = read_initial_length (abfd, addr, &bytes_read);
+ addr += bytes_read;
+
+ map.dwarf5_is_dwarf64 = bytes_read != 4;
+ map.offset_size = map.dwarf5_is_dwarf64 ? 8 : 4;
+ if (bytes_read + length != section->size)
+ {
+ /* There may be multiple per-CU indices. */
+ warning (_("Section .debug_names in %s length %s does not match "
+ "section length %s, ignoring .debug_names."),
+ filename, plongest (bytes_read + length),
+ pulongest (section->size));
+ return false;
+ }
+
+ /* The version number. */
+ uint16_t version = read_2_bytes (abfd, addr);
+ addr += 2;
+ if (version != 5)
+ {
+ warning (_("Section .debug_names in %s has unsupported version %d, "
+ "ignoring .debug_names."),
+ filename, version);
+ return false;
+ }
+
+ /* Padding. */
+ uint16_t padding = read_2_bytes (abfd, addr);
+ addr += 2;
+ if (padding != 0)
+ {
+ warning (_("Section .debug_names in %s has unsupported padding %d, "
+ "ignoring .debug_names."),
+ filename, padding);
+ return false;
+ }
+
+ /* comp_unit_count - The number of CUs in the CU list. */
+ map.cu_count = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* local_type_unit_count - The number of TUs in the local TU
+ list. */
+ map.tu_count = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* foreign_type_unit_count - The number of TUs in the foreign TU
+ list. */
+ uint32_t foreign_tu_count = read_4_bytes (abfd, addr);
+ addr += 4;
+ if (foreign_tu_count != 0)
+ {
+ warning (_("Section .debug_names in %s has unsupported %lu foreign TUs, "
+ "ignoring .debug_names."),
+ filename, static_cast<unsigned long> (foreign_tu_count));
+ return false;
+ }
+
+ /* bucket_count - The number of hash buckets in the hash lookup
+ table. */
+ map.bucket_count = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* name_count - The number of unique names in the index. */
+ map.name_count = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* abbrev_table_size - The size in bytes of the abbreviations
+ table. */
+ uint32_t abbrev_table_size = read_4_bytes (abfd, addr);
+ addr += 4;
+
+ /* augmentation_string_size - The size in bytes of the augmentation
+ string. This value is rounded up to a multiple of 4. */
+ uint32_t augmentation_string_size = read_4_bytes (abfd, addr);
+ addr += 4;
+ map.augmentation_is_gdb = ((augmentation_string_size
+ == sizeof (dwarf5_augmentation))
+ && memcmp (addr, dwarf5_augmentation,
+ sizeof (dwarf5_augmentation)) == 0);
+ augmentation_string_size += (-augmentation_string_size) & 3;
+ addr += augmentation_string_size;
+
+ /* List of CUs */
+ map.cu_table_reordered = addr;
+ addr += map.cu_count * map.offset_size;
+
+ /* List of Local TUs */
+ map.tu_table_reordered = addr;
+ addr += map.tu_count * map.offset_size;
+
+ /* Hash Lookup Table */
+ map.bucket_table_reordered = reinterpret_cast<const uint32_t *> (addr);
+ addr += map.bucket_count * 4;
+ map.hash_table_reordered = reinterpret_cast<const uint32_t *> (addr);
+ addr += map.name_count * 4;
+
+ /* Name Table */
+ map.name_table_string_offs_reordered = addr;
+ addr += map.name_count * map.offset_size;
+ map.name_table_entry_offs_reordered = addr;
+ addr += map.name_count * map.offset_size;
+
+ const gdb_byte *abbrev_table_start = addr;
+ for (;;)
+ {
+ const ULONGEST index_num = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+ if (index_num == 0)
+ break;
+
+ const auto insertpair
+ = map.abbrev_map.emplace (index_num, mapped_debug_names::index_val ());
+ if (!insertpair.second)
+ {
+ warning (_("Section .debug_names in %s has duplicate index %s, "
+ "ignoring .debug_names."),
+ filename, pulongest (index_num));
+ return false;
+ }
+ mapped_debug_names::index_val &indexval = insertpair.first->second;
+ indexval.dwarf_tag = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+
+ for (;;)
+ {
+ mapped_debug_names::index_val::attr attr;
+ attr.dw_idx = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+ attr.form = read_unsigned_leb128 (abfd, addr, &bytes_read);
+ addr += bytes_read;
+ if (attr.form == DW_FORM_implicit_const)
+ {
+ attr.implicit_const = read_signed_leb128 (abfd, addr,
+ &bytes_read);
+ addr += bytes_read;
+ }
+ if (attr.dw_idx == 0 && attr.form == 0)
+ break;
+ indexval.attr_vec.push_back (std::move (attr));
+ }
+ }
+ if (addr != abbrev_table_start + abbrev_table_size)
+ {
+ warning (_("Section .debug_names in %s has abbreviation_table "
+ "of size %s vs. written as %u, ignoring .debug_names."),
+ filename, plongest (addr - abbrev_table_start),
+ abbrev_table_size);
+ return false;
+ }
+ map.entry_pool = addr;
+
+ return true;
+}
+
+/* A helper for create_cus_from_debug_names that handles the MAP's CU
+ list. */
+
+static bool
+create_cus_from_debug_names_list (dwarf2_per_bfd *per_bfd,
+ const mapped_debug_names &map,
+ dwarf2_section_info §ion,
+ bool is_dwz)
+{
+ if (!map.augmentation_is_gdb)
+ {
+ for (uint32_t i = 0; i < map.cu_count; ++i)
+ {
+ sect_offset sect_off
+ = (sect_offset) (extract_unsigned_integer
+ (map.cu_table_reordered + i * map.offset_size,
+ map.offset_size,
+ map.dwarf5_byte_order));
+ /* We don't know the length of the CU, because the CU list in a
+ .debug_names index can be incomplete, so we can't use the start
+ of the next CU as end of this CU. We create the CUs here with
+ length 0, and in cutu_reader::cutu_reader we'll fill in the
+ actual length. */
+ dwarf2_per_cu_data_up per_cu
+ = create_cu_from_index_list (per_bfd, §ion, is_dwz,
+ sect_off, 0);
+ per_bfd->all_units.push_back (std::move (per_cu));
+ }
+ return true;
+ }
+
+ sect_offset sect_off_prev;
+ for (uint32_t i = 0; i <= map.cu_count; ++i)
+ {
+ sect_offset sect_off_next;
+ if (i < map.cu_count)
+ {
+ sect_off_next
+ = (sect_offset) (extract_unsigned_integer
+ (map.cu_table_reordered + i * map.offset_size,
+ map.offset_size,
+ map.dwarf5_byte_order));
+ }
+ else
+ sect_off_next = (sect_offset) section.size;
+ if (i >= 1)
+ {
+ if (sect_off_next == sect_off_prev)
+ {
+ warning (_("Section .debug_names has duplicate entry in CU table,"
+ " ignoring .debug_names."));
+ return false;
+ }
+ if (sect_off_next < sect_off_prev)
+ {
+ warning (_("Section .debug_names has non-ascending CU table,"
+ " ignoring .debug_names."));
+ return false;
+ }
+ /* Note: we're not using length = sect_off_next - sect_off_prev,
+ to gracefully handle an incomplete CU list. */
+ const ULONGEST length = 0;
+ dwarf2_per_cu_data_up per_cu
+ = create_cu_from_index_list (per_bfd, §ion, is_dwz,
+ sect_off_prev, length);
+ per_bfd->all_units.push_back (std::move (per_cu));
+ }
+ sect_off_prev = sect_off_next;
+ }
+
+ return true;
+}
+
+/* Read the CU list from the mapped index, and use it to create all
+ the CU objects for this dwarf2_per_objfile. */
+
+static bool
+create_cus_from_debug_names (dwarf2_per_bfd *per_bfd,
+ const mapped_debug_names &map,
+ const mapped_debug_names &dwz_map)
+{
+ gdb_assert (per_bfd->all_units.empty ());
+ per_bfd->all_units.reserve (map.cu_count + dwz_map.cu_count);
+
+ if (!create_cus_from_debug_names_list (per_bfd, map, per_bfd->info,
+ false /* is_dwz */))
+ return false;
+
+ if (dwz_map.cu_count == 0)
+ return true;
+
+ dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
+ return create_cus_from_debug_names_list (per_bfd, dwz_map, dwz->info,
+ true /* is_dwz */);
+}
+
+/* See read-debug-names.h. */
+
+bool
+dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile)
+{
+ std::unique_ptr<mapped_debug_names> map (new mapped_debug_names);
+ mapped_debug_names dwz_map;
+ struct objfile *objfile = per_objfile->objfile;
+ dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
+
+ if (!read_debug_names_from_section (objfile, objfile_name (objfile),
+ &per_bfd->debug_names, *map))
+ return false;
+
+ /* Don't use the index if it's empty. */
+ if (map->name_count == 0)
+ return false;
+
+ /* If there is a .dwz file, read it so we can get its CU list as
+ well. */
+ dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
+ if (dwz != NULL)
+ {
+ if (!read_debug_names_from_section (objfile,
+ bfd_get_filename (dwz->dwz_bfd.get ()),
+ &dwz->debug_names, dwz_map))
+ {
+ warning (_("could not read '.debug_names' section from %s; skipping"),
+ bfd_get_filename (dwz->dwz_bfd.get ()));
+ return false;
+ }
+ }
+
+ if (!create_cus_from_debug_names (per_bfd, *map, dwz_map))
+ {
+ per_bfd->all_units.clear ();
+ return false;
+ }
+
+ if (map->tu_count != 0)
+ {
+ /* We can only handle a single .debug_types when we have an
+ index. */
+ if (per_bfd->types.size () > 1)
+ {
+ per_bfd->all_units.clear ();
+ return false;
+ }
+
+ dwarf2_section_info *section
+ = (per_bfd->types.size () == 1
+ ? &per_bfd->types[0]
+ : &per_bfd->info);
+
+ create_signatured_type_table_from_debug_names
+ (per_objfile, *map, section, &per_bfd->abbrev);
+ }
+
+ finalize_all_units (per_bfd);
+
+ create_addrmap_from_aranges (per_objfile, &per_bfd->debug_aranges);
+
+ per_bfd->index_table = std::move (map);
+ per_bfd->quick_file_names_table =
+ create_quick_file_names_table (per_bfd->all_units.size ());
+
+ return true;
+}
+
+/* Type used to manage iterating over all CUs looking for a symbol for
+ .debug_names. */
+
+class dw2_debug_names_iterator
+{
+public:
+ dw2_debug_names_iterator (const mapped_debug_names &map,
+ block_search_flags block_index,
+ domain_enum domain,
+ const char *name, dwarf2_per_objfile *per_objfile)
+ : m_map (map), m_block_index (block_index), m_domain (domain),
+ m_addr (find_vec_in_debug_names (map, name, per_objfile)),
+ m_per_objfile (per_objfile)
+ {}
+
+ dw2_debug_names_iterator (const mapped_debug_names &map,
+ search_domain search, uint32_t namei,
+ dwarf2_per_objfile *per_objfile,
+ domain_enum domain = UNDEF_DOMAIN)
+ : m_map (map),
+ m_domain (domain),
+ m_search (search),
+ m_addr (find_vec_in_debug_names (map, namei, per_objfile)),
+ m_per_objfile (per_objfile)
+ {}
+
+ dw2_debug_names_iterator (const mapped_debug_names &map,
+ block_search_flags block_index, domain_enum domain,
+ uint32_t namei, dwarf2_per_objfile *per_objfile)
+ : m_map (map), m_block_index (block_index), m_domain (domain),
+ m_addr (find_vec_in_debug_names (map, namei, per_objfile)),
+ m_per_objfile (per_objfile)
+ {}
+
+ /* Return the next matching CU or NULL if there are no more. */
+ dwarf2_per_cu_data *next ();
+
+private:
+ static const gdb_byte *find_vec_in_debug_names (const mapped_debug_names &map,
+ const char *name,
+ dwarf2_per_objfile *per_objfile);
+ static const gdb_byte *find_vec_in_debug_names (const mapped_debug_names &map,
+ uint32_t namei,
+ dwarf2_per_objfile *per_objfile);
+
+ /* The internalized form of .debug_names. */
+ const mapped_debug_names &m_map;
+
+ /* Restrict the search to these blocks. */
+ block_search_flags m_block_index = (SEARCH_GLOBAL_BLOCK
+ | SEARCH_STATIC_BLOCK);
+
+ /* The kind of symbol we're looking for. */
+ const domain_enum m_domain = UNDEF_DOMAIN;
+ const search_domain m_search = ALL_DOMAIN;
+
+ /* The list of CUs from the index entry of the symbol, or NULL if
+ not found. */
+ const gdb_byte *m_addr;
+
+ dwarf2_per_objfile *m_per_objfile;
+};
+
+const char *
+mapped_debug_names::namei_to_name
+ (uint32_t namei, dwarf2_per_objfile *per_objfile) const
+{
+ const ULONGEST namei_string_offs
+ = extract_unsigned_integer ((name_table_string_offs_reordered
+ + namei * offset_size),
+ offset_size,
+ dwarf5_byte_order);
+ return read_indirect_string_at_offset (per_objfile, namei_string_offs);
+}
+
+/* Find a slot in .debug_names for the object named NAME. If NAME is
+ found, return pointer to its pool data. If NAME cannot be found,
+ return NULL. */
+
+const gdb_byte *
+dw2_debug_names_iterator::find_vec_in_debug_names
+ (const mapped_debug_names &map, const char *name,
+ dwarf2_per_objfile *per_objfile)
+{
+ int (*cmp) (const char *, const char *);
+
+ gdb::unique_xmalloc_ptr<char> without_params;
+ if (current_language->la_language == language_cplus
+ || current_language->la_language == language_fortran
+ || current_language->la_language == language_d)
+ {
+ /* NAME is already canonical. Drop any qualifiers as
+ .debug_names does not contain any. */
+
+ if (strchr (name, '(') != NULL)
+ {
+ without_params = cp_remove_params (name);
+ if (without_params != NULL)
+ name = without_params.get ();
+ }
+ }
+
+ cmp = (case_sensitivity == case_sensitive_on ? strcmp : strcasecmp);
+
+ const uint32_t full_hash = dwarf5_djb_hash (name);
+ uint32_t namei
+ = extract_unsigned_integer (reinterpret_cast<const gdb_byte *>
+ (map.bucket_table_reordered
+ + (full_hash % map.bucket_count)), 4,
+ map.dwarf5_byte_order);
+ if (namei == 0)
+ return NULL;
+ --namei;
+ if (namei >= map.name_count)
+ {
+ complaint (_("Wrong .debug_names with name index %u but name_count=%u "
+ "[in module %s]"),
+ namei, map.name_count,
+ objfile_name (per_objfile->objfile));
+ return NULL;
+ }
+
+ for (;;)
+ {
+ const uint32_t namei_full_hash
+ = extract_unsigned_integer (reinterpret_cast<const gdb_byte *>
+ (map.hash_table_reordered + namei), 4,
+ map.dwarf5_byte_order);
+ if (full_hash % map.bucket_count != namei_full_hash % map.bucket_count)
+ return NULL;
+
+ if (full_hash == namei_full_hash)
+ {
+ const char *const namei_string = map.namei_to_name (namei, per_objfile);
+
+#if 0 /* An expensive sanity check. */
+ if (namei_full_hash != dwarf5_djb_hash (namei_string))
+ {
+ complaint (_("Wrong .debug_names hash for string at index %u "
+ "[in module %s]"),
+ namei, objfile_name (dwarf2_per_objfile->objfile));
+ return NULL;
+ }
+#endif
+
+ if (cmp (namei_string, name) == 0)
+ {
+ const ULONGEST namei_entry_offs
+ = extract_unsigned_integer ((map.name_table_entry_offs_reordered
+ + namei * map.offset_size),
+ map.offset_size, map.dwarf5_byte_order);
+ return map.entry_pool + namei_entry_offs;
+ }
+ }
+
+ ++namei;
+ if (namei >= map.name_count)
+ return NULL;
+ }
+}
+
+const gdb_byte *
+dw2_debug_names_iterator::find_vec_in_debug_names
+ (const mapped_debug_names &map, uint32_t namei, dwarf2_per_objfile *per_objfile)
+{
+ if (namei >= map.name_count)
+ {
+ complaint (_("Wrong .debug_names with name index %u but name_count=%u "
+ "[in module %s]"),
+ namei, map.name_count,
+ objfile_name (per_objfile->objfile));
+ return NULL;
+ }
+
+ const ULONGEST namei_entry_offs
+ = extract_unsigned_integer ((map.name_table_entry_offs_reordered
+ + namei * map.offset_size),
+ map.offset_size, map.dwarf5_byte_order);
+ return map.entry_pool + namei_entry_offs;
+}
+
+/* See dw2_debug_names_iterator. */
+
+dwarf2_per_cu_data *
+dw2_debug_names_iterator::next ()
+{
+ if (m_addr == NULL)
+ return NULL;
+
+ dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd;
+ struct objfile *objfile = m_per_objfile->objfile;
+ bfd *const abfd = objfile->obfd.get ();
+
+ again:
+
+ unsigned int bytes_read;
+ const ULONGEST abbrev = read_unsigned_leb128 (abfd, m_addr, &bytes_read);
+ m_addr += bytes_read;
+ if (abbrev == 0)
+ return NULL;
+
+ const auto indexval_it = m_map.abbrev_map.find (abbrev);
+ if (indexval_it == m_map.abbrev_map.cend ())
+ {
+ complaint (_("Wrong .debug_names undefined abbrev code %s "
+ "[in module %s]"),
+ pulongest (abbrev), objfile_name (objfile));
+ return NULL;
+ }
+ const mapped_debug_names::index_val &indexval = indexval_it->second;
+ enum class symbol_linkage {
+ unknown,
+ static_,
+ extern_,
+ } symbol_linkage_ = symbol_linkage::unknown;
+ dwarf2_per_cu_data *per_cu = NULL;
+ for (const mapped_debug_names::index_val::attr &attr : indexval.attr_vec)
+ {
+ ULONGEST ull;
+ switch (attr.form)
+ {
+ case DW_FORM_implicit_const:
+ ull = attr.implicit_const;
+ break;
+ case DW_FORM_flag_present:
+ ull = 1;
+ break;
+ case DW_FORM_udata:
+ ull = read_unsigned_leb128 (abfd, m_addr, &bytes_read);
+ m_addr += bytes_read;
+ break;
+ case DW_FORM_ref4:
+ ull = read_4_bytes (abfd, m_addr);
+ m_addr += 4;
+ break;
+ case DW_FORM_ref8:
+ ull = read_8_bytes (abfd, m_addr);
+ m_addr += 8;
+ break;
+ case DW_FORM_ref_sig8:
+ ull = read_8_bytes (abfd, m_addr);
+ m_addr += 8;
+ break;
+ default:
+ complaint (_("Unsupported .debug_names form %s [in module %s]"),
+ dwarf_form_name (attr.form),
+ objfile_name (objfile));
+ return NULL;
+ }
+ switch (attr.dw_idx)
+ {
+ case DW_IDX_compile_unit:
+ {
+ /* Don't crash on bad data. */
+ if (ull >= per_bfd->all_comp_units.size ())
+ {
+ complaint (_(".debug_names entry has bad CU index %s"
+ " [in module %s]"),
+ pulongest (ull),
+ objfile_name (objfile));
+ continue;
+ }
+ }
+ per_cu = per_bfd->get_cu (ull);
+ break;
+ case DW_IDX_type_unit:
+ /* Don't crash on bad data. */
+ if (ull >= per_bfd->all_type_units.size ())
+ {
+ complaint (_(".debug_names entry has bad TU index %s"
+ " [in module %s]"),
+ pulongest (ull),
+ objfile_name (objfile));
+ continue;
+ }
+ {
+ int nr_cus = per_bfd->all_comp_units.size ();
+ per_cu = per_bfd->get_cu (nr_cus + ull);
+ }
+ break;
+ case DW_IDX_die_offset:
+ /* In a per-CU index (as opposed to a per-module index), index
+ entries without CU attribute implicitly refer to the single CU. */
+ if (per_cu == NULL)
+ per_cu = per_bfd->get_cu (0);
+ break;
+ case DW_IDX_GNU_internal:
+ if (!m_map.augmentation_is_gdb)
+ break;
+ symbol_linkage_ = symbol_linkage::static_;
+ break;
+ case DW_IDX_GNU_external:
+ if (!m_map.augmentation_is_gdb)
+ break;
+ symbol_linkage_ = symbol_linkage::extern_;
+ break;
+ }
+ }
+
+ /* Skip if we couldn't find a valid CU/TU index. */
+ if (per_cu == nullptr)
+ goto again;
+
+ /* Skip if already read in. */
+ if (m_per_objfile->symtab_set_p (per_cu))
+ goto again;
+
+ /* Check static vs global. */
+ if (symbol_linkage_ != symbol_linkage::unknown)
+ {
+ if (symbol_linkage_ == symbol_linkage::static_)
+ {
+ if ((m_block_index & SEARCH_STATIC_BLOCK) == 0)
+ goto again;
+ }
+ else
+ {
+ if ((m_block_index & SEARCH_GLOBAL_BLOCK) == 0)
+ goto again;
+ }
+ }
+
+ /* Match dw2_symtab_iter_next, symbol_kind
+ and debug_names::psymbol_tag. */
+ switch (m_domain)
+ {
+ case VAR_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_variable:
+ case DW_TAG_subprogram:
+ /* Some types are also in VAR_DOMAIN. */
+ case DW_TAG_typedef:
+ case DW_TAG_structure_type:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ case STRUCT_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_typedef:
+ case DW_TAG_structure_type:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ case LABEL_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case 0:
+ case DW_TAG_variable:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ case MODULE_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_module:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ default:
+ break;
+ }
+
+ /* Match dw2_expand_symtabs_matching, symbol_kind and
+ debug_names::psymbol_tag. */
+ switch (m_search)
+ {
+ case VARIABLES_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_variable:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ case FUNCTIONS_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_subprogram:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ case TYPES_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_typedef:
+ case DW_TAG_structure_type:
+ break;
+ default:
+ goto again;
+ }
+ break;
+ case MODULES_DOMAIN:
+ switch (indexval.dwarf_tag)
+ {
+ case DW_TAG_module:
+ break;
+ default:
+ goto again;
+ }
+ default:
+ break;
+ }
+
+ return per_cu;
+}
+
+/* This dumps minimal information about .debug_names. It is called
+ via "mt print objfiles". The gdb.dwarf2/gdb-index.exp testcase
+ uses this to verify that .debug_names has been loaded. */
+
+void
+dwarf2_debug_names_index::dump (struct objfile *objfile)
+{
+ gdb_printf (".debug_names: exists\n");
+}
+
+void
+dwarf2_debug_names_index::expand_matching_symbols
+ (struct objfile *objfile,
+ const lookup_name_info &name, domain_enum domain,
+ int global,
+ symbol_compare_ftype *ordered_compare)
+{
+ dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
+
+ mapped_debug_names &map
+ = *(gdb::checked_static_cast<mapped_debug_names *>
+ (per_objfile->per_bfd->index_table.get ()));
+ const block_search_flags block_flags
+ = global ? SEARCH_GLOBAL_BLOCK : SEARCH_STATIC_BLOCK;
+
+ const char *match_name = name.ada ().lookup_name ().c_str ();
+ auto matcher = [&] (const char *symname)
+ {
+ if (ordered_compare == nullptr)
+ return true;
+ return ordered_compare (symname, match_name) == 0;
+ };
+
+ dw2_expand_symtabs_matching_symbol (map, name, matcher,
+ [&] (offset_type namei)
+ {
+ /* The name was matched, now expand corresponding CUs that were
+ marked. */
+ dw2_debug_names_iterator iter (map, block_flags, domain, namei,
+ per_objfile);
+
+ struct dwarf2_per_cu_data *per_cu;
+ while ((per_cu = iter.next ()) != NULL)
+ dw2_expand_symtabs_matching_one (per_cu, per_objfile, nullptr,
+ nullptr);
+ return true;
+ }, per_objfile);
+}
+
+bool
+dwarf2_debug_names_index::expand_symtabs_matching
+ (struct objfile *objfile,
+ gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
+ const lookup_name_info *lookup_name,
+ gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
+ gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
+ block_search_flags search_flags,
+ domain_enum domain,
+ enum search_domain kind)
+{
+ dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
+
+ dw_expand_symtabs_matching_file_matcher (per_objfile, file_matcher);
+
+ /* This invariant is documented in quick-functions.h. */
+ gdb_assert (lookup_name != nullptr || symbol_matcher == nullptr);
+ if (lookup_name == nullptr)
+ {
+ for (dwarf2_per_cu_data *per_cu
+ : all_units_range (per_objfile->per_bfd))
+ {
+ QUIT;
+
+ if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
+ file_matcher,
+ expansion_notify))
+ return false;
+ }
+ return true;
+ }
+
+ mapped_debug_names &map
+ = *(gdb::checked_static_cast<mapped_debug_names *>
+ (per_objfile->per_bfd->index_table.get ()));
+
+ bool result
+ = dw2_expand_symtabs_matching_symbol (map, *lookup_name,
+ symbol_matcher,
+ [&] (offset_type namei)
+ {
+ /* The name was matched, now expand corresponding CUs that were
+ marked. */
+ dw2_debug_names_iterator iter (map, kind, namei, per_objfile, domain);
+
+ struct dwarf2_per_cu_data *per_cu;
+ while ((per_cu = iter.next ()) != NULL)
+ if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
+ file_matcher,
+ expansion_notify))
+ return false;
+ return true;
+ }, per_objfile);
+
+ return result;
+}
diff --git a/gdb/dwarf2/read-debug-names.h b/gdb/dwarf2/read-debug-names.h
new file mode 100644
index 000000000000..0c20e8cfb8db
--- /dev/null
+++ b/gdb/dwarf2/read-debug-names.h
@@ -0,0 +1,30 @@
+/* Reading code for .debug_names
+
+ Copyright (C) 2023 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef DWARF2_READ_DEBUG_NAMES_H
+#define DWARF2_READ_DEBUG_NAMES_H
+
+struct dwarf2_per_objfile;
+
+/* Read .debug_names. If everything went ok, initialize the "quick"
+ elements of all the CUs and return true. Otherwise, return false. */
+
+bool dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile);
+
+#endif /* DWARF2_READ_DEBUG_NAMES_H */
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 1d6f61a71307..9b83730478ff 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -41,6 +41,7 @@
#include "dwarf2/dwz.h"
#include "dwarf2/macro.h"
#include "dwarf2/die.h"
+#include "dwarf2/read-debug-names.h"
#include "dwarf2/read-gdb-index.h"
#include "dwarf2/sect-names.h"
#include "dwarf2/stringify.h"
@@ -156,59 +157,6 @@ static int dwarf2_loclist_block_index;
/* Size of .debug_rnglists section header for 64-bit DWARF format. */
#define RNGLIST_HEADER_SIZE64 20
-
-
-/* A description of the mapped .debug_names.
- Uninitialized map has CU_COUNT 0. */
-struct mapped_debug_names final : public mapped_index_base
-{
- bfd_endian dwarf5_byte_order;
- bool dwarf5_is_dwarf64;
- bool augmentation_is_gdb;
- uint8_t offset_size;
- uint32_t cu_count = 0;
- uint32_t tu_count, bucket_count, name_count;
- const gdb_byte *cu_table_reordered, *tu_table_reordered;
- const uint32_t *bucket_table_reordered, *hash_table_reordered;
- const gdb_byte *name_table_string_offs_reordered;
- const gdb_byte *name_table_entry_offs_reordered;
- const gdb_byte *entry_pool;
-
- struct index_val
- {
- ULONGEST dwarf_tag;
- struct attr
- {
- /* Attribute name DW_IDX_*. */
- ULONGEST dw_idx;
-
- /* Attribute form DW_FORM_*. */
- ULONGEST form;
-
- /* Value if FORM is DW_FORM_implicit_const. */
- LONGEST implicit_const;
- };
- std::vector<attr> attr_vec;
- };
-
- std::unordered_map<ULONGEST, index_val> abbrev_map;
-
- const char *namei_to_name
- (uint32_t namei, dwarf2_per_objfile *per_objfile) const;
-
- /* Implementation of the mapped_index_base virtual interface, for
- the name_components cache. */
-
- const char *symbol_name_at
- (offset_type idx, dwarf2_per_objfile *per_objfile) const override
- { return namei_to_name (idx, per_objfile); }
-
- size_t symbol_name_count () const override
- { return this->name_count; }
-
- quick_symbol_functions_up make_quick_functions () const override;
-};
-
/* See dwarf2/read.h. */
dwarf2_per_objfile *
@@ -1666,34 +1614,6 @@ struct readnow_functions : public dwarf2_base_index_functions
}
};
-struct dwarf2_debug_names_index : public dwarf2_base_index_functions
-{
- void dump (struct objfile *objfile) override;
-
- void expand_matching_symbols
- (struct objfile *,
- const lookup_name_info &lookup_name,
- domain_enum domain,
- int global,
- symbol_compare_ftype *ordered_compare) override;
-
- bool expand_symtabs_matching
- (struct objfile *objfile,
- gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
- const lookup_name_info *lookup_name,
- gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
- gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
- block_search_flags search_flags,
- domain_enum domain,
- enum search_domain kind) override;
-};
-
-quick_symbol_functions_up
-mapped_debug_names::make_quick_functions () const
-{
- return quick_symbol_functions_up (new dwarf2_debug_names_index);
-}
-
/* Utility hash function for a stmt_list_hash. */
static hashval_t
@@ -1876,61 +1796,11 @@ create_cu_from_index_list (dwarf2_per_bfd *per_bfd,
return the_cu;
}
-/* Create the signatured type hash table from .debug_names. */
-
-static void
-create_signatured_type_table_from_debug_names
- (dwarf2_per_objfile *per_objfile,
- const mapped_debug_names &map,
- struct dwarf2_section_info *section,
- struct dwarf2_section_info *abbrev_section)
-{
- struct objfile *objfile = per_objfile->objfile;
-
- section->read (objfile);
- abbrev_section->read (objfile);
-
- htab_up sig_types_hash = allocate_signatured_type_table ();
-
- for (uint32_t i = 0; i < map.tu_count; ++i)
- {
- signatured_type_up sig_type;
- void **slot;
-
- sect_offset sect_off
- = (sect_offset) (extract_unsigned_integer
- (map.tu_table_reordered + i * map.offset_size,
- map.offset_size,
- map.dwarf5_byte_order));
-
- comp_unit_head cu_header;
- read_and_check_comp_unit_head (per_objfile, &cu_header, section,
- abbrev_section,
- section->buffer + to_underlying (sect_off),
- rcuh_kind::TYPE);
-
- sig_type = per_objfile->per_bfd->allocate_signatured_type
- (cu_header.signature);
- sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
- sig_type->section = section;
- sig_type->sect_off = sect_off;
-
- slot = htab_find_slot (sig_types_hash.get (), sig_type.get (), INSERT);
- *slot = sig_type.get ();
-
- per_objfile->per_bfd->all_units.emplace_back (sig_type.release ());
- }
-
- per_objfile->per_bfd->signatured_types = std::move (sig_types_hash);
-}
-
-/* Read the address map data from DWARF-5 .debug_aranges, and use it
- to populate given addrmap. Returns true on success, false on
- failure. */
+/* See read.h. */
-static bool
+bool
read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
- struct dwarf2_section_info *section,
+ dwarf2_section_info *section,
addrmap *mutable_map)
{
struct objfile *objfile = per_objfile->objfile;
@@ -2107,23 +1977,6 @@ read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
return true;
}
-/* Read the address map data from DWARF-5 .debug_aranges, and use it to
- populate the index_addrmap. */
-
-static void
-create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
- struct dwarf2_section_info *section)
-{
- dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
-
- addrmap_mutable mutable_map;
-
- if (read_addrmap_from_aranges (per_objfile, section, &mutable_map))
- per_bfd->index_addrmap
- = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack,
- &mutable_map);
-}
-
/* die_reader_func for dw2_get_file_names. */
static void
@@ -3431,886 +3284,6 @@ dwarf2_base_index_functions::has_unexpanded_symtabs (struct objfile *objfile)
return false;
}
-/* DWARF-5 debug_names reader. */
-
-/* DWARF-5 augmentation string for GDB's DW_IDX_GNU_* extension. */
-static const gdb_byte dwarf5_augmentation[] = { 'G', 'D', 'B', 0 };
-
-/* A helper function that reads the .debug_names section in SECTION
- and fills in MAP. FILENAME is the name of the file containing the
- section; it is used for error reporting.
-
- Returns true if all went well, false otherwise. */
-
-static bool
-read_debug_names_from_section (struct objfile *objfile,
- const char *filename,
- struct dwarf2_section_info *section,
- mapped_debug_names &map)
-{
- if (section->empty ())
- return false;
-
- /* Older elfutils strip versions could keep the section in the main
- executable while splitting it for the separate debug info file. */
- if ((section->get_flags () & SEC_HAS_CONTENTS) == 0)
- return false;
-
- section->read (objfile);
-
- map.dwarf5_byte_order = gdbarch_byte_order (objfile->arch ());
-
- const gdb_byte *addr = section->buffer;
-
- bfd *const abfd = section->get_bfd_owner ();
-
- unsigned int bytes_read;
- LONGEST length = read_initial_length (abfd, addr, &bytes_read);
- addr += bytes_read;
-
- map.dwarf5_is_dwarf64 = bytes_read != 4;
- map.offset_size = map.dwarf5_is_dwarf64 ? 8 : 4;
- if (bytes_read + length != section->size)
- {
- /* There may be multiple per-CU indices. */
- warning (_("Section .debug_names in %s length %s does not match "
- "section length %s, ignoring .debug_names."),
- filename, plongest (bytes_read + length),
- pulongest (section->size));
- return false;
- }
-
- /* The version number. */
- uint16_t version = read_2_bytes (abfd, addr);
- addr += 2;
- if (version != 5)
- {
- warning (_("Section .debug_names in %s has unsupported version %d, "
- "ignoring .debug_names."),
- filename, version);
- return false;
- }
-
- /* Padding. */
- uint16_t padding = read_2_bytes (abfd, addr);
- addr += 2;
- if (padding != 0)
- {
- warning (_("Section .debug_names in %s has unsupported padding %d, "
- "ignoring .debug_names."),
- filename, padding);
- return false;
- }
-
- /* comp_unit_count - The number of CUs in the CU list. */
- map.cu_count = read_4_bytes (abfd, addr);
- addr += 4;
-
- /* local_type_unit_count - The number of TUs in the local TU
- list. */
- map.tu_count = read_4_bytes (abfd, addr);
- addr += 4;
-
- /* foreign_type_unit_count - The number of TUs in the foreign TU
- list. */
- uint32_t foreign_tu_count = read_4_bytes (abfd, addr);
- addr += 4;
- if (foreign_tu_count != 0)
- {
- warning (_("Section .debug_names in %s has unsupported %lu foreign TUs, "
- "ignoring .debug_names."),
- filename, static_cast<unsigned long> (foreign_tu_count));
- return false;
- }
-
- /* bucket_count - The number of hash buckets in the hash lookup
- table. */
- map.bucket_count = read_4_bytes (abfd, addr);
- addr += 4;
-
- /* name_count - The number of unique names in the index. */
- map.name_count = read_4_bytes (abfd, addr);
- addr += 4;
-
- /* abbrev_table_size - The size in bytes of the abbreviations
- table. */
- uint32_t abbrev_table_size = read_4_bytes (abfd, addr);
- addr += 4;
-
- /* augmentation_string_size - The size in bytes of the augmentation
- string. This value is rounded up to a multiple of 4. */
- uint32_t augmentation_string_size = read_4_bytes (abfd, addr);
- addr += 4;
- map.augmentation_is_gdb = ((augmentation_string_size
- == sizeof (dwarf5_augmentation))
- && memcmp (addr, dwarf5_augmentation,
- sizeof (dwarf5_augmentation)) == 0);
- augmentation_string_size += (-augmentation_string_size) & 3;
- addr += augmentation_string_size;
-
- /* List of CUs */
- map.cu_table_reordered = addr;
- addr += map.cu_count * map.offset_size;
-
- /* List of Local TUs */
- map.tu_table_reordered = addr;
- addr += map.tu_count * map.offset_size;
-
- /* Hash Lookup Table */
- map.bucket_table_reordered = reinterpret_cast<const uint32_t *> (addr);
- addr += map.bucket_count * 4;
- map.hash_table_reordered = reinterpret_cast<const uint32_t *> (addr);
- addr += map.name_count * 4;
-
- /* Name Table */
- map.name_table_string_offs_reordered = addr;
- addr += map.name_count * map.offset_size;
- map.name_table_entry_offs_reordered = addr;
- addr += map.name_count * map.offset_size;
-
- const gdb_byte *abbrev_table_start = addr;
- for (;;)
- {
- const ULONGEST index_num = read_unsigned_leb128 (abfd, addr, &bytes_read);
- addr += bytes_read;
- if (index_num == 0)
- break;
-
- const auto insertpair
- = map.abbrev_map.emplace (index_num, mapped_debug_names::index_val ());
- if (!insertpair.second)
- {
- warning (_("Section .debug_names in %s has duplicate index %s, "
- "ignoring .debug_names."),
- filename, pulongest (index_num));
- return false;
- }
- mapped_debug_names::index_val &indexval = insertpair.first->second;
- indexval.dwarf_tag = read_unsigned_leb128 (abfd, addr, &bytes_read);
- addr += bytes_read;
-
- for (;;)
- {
- mapped_debug_names::index_val::attr attr;
- attr.dw_idx = read_unsigned_leb128 (abfd, addr, &bytes_read);
- addr += bytes_read;
- attr.form = read_unsigned_leb128 (abfd, addr, &bytes_read);
- addr += bytes_read;
- if (attr.form == DW_FORM_implicit_const)
- {
- attr.implicit_const = read_signed_leb128 (abfd, addr,
- &bytes_read);
- addr += bytes_read;
- }
- if (attr.dw_idx == 0 && attr.form == 0)
- break;
- indexval.attr_vec.push_back (std::move (attr));
- }
- }
- if (addr != abbrev_table_start + abbrev_table_size)
- {
- warning (_("Section .debug_names in %s has abbreviation_table "
- "of size %s vs. written as %u, ignoring .debug_names."),
- filename, plongest (addr - abbrev_table_start),
- abbrev_table_size);
- return false;
- }
- map.entry_pool = addr;
-
- return true;
-}
-
-/* A helper for create_cus_from_debug_names that handles the MAP's CU
- list. */
-
-static bool
-create_cus_from_debug_names_list (dwarf2_per_bfd *per_bfd,
- const mapped_debug_names &map,
- dwarf2_section_info §ion,
- bool is_dwz)
-{
- if (!map.augmentation_is_gdb)
- {
- for (uint32_t i = 0; i < map.cu_count; ++i)
- {
- sect_offset sect_off
- = (sect_offset) (extract_unsigned_integer
- (map.cu_table_reordered + i * map.offset_size,
- map.offset_size,
- map.dwarf5_byte_order));
- /* We don't know the length of the CU, because the CU list in a
- .debug_names index can be incomplete, so we can't use the start
- of the next CU as end of this CU. We create the CUs here with
- length 0, and in cutu_reader::cutu_reader we'll fill in the
- actual length. */
- dwarf2_per_cu_data_up per_cu
- = create_cu_from_index_list (per_bfd, §ion, is_dwz,
- sect_off, 0);
- per_bfd->all_units.push_back (std::move (per_cu));
- }
- return true;
- }
-
- sect_offset sect_off_prev;
- for (uint32_t i = 0; i <= map.cu_count; ++i)
- {
- sect_offset sect_off_next;
- if (i < map.cu_count)
- {
- sect_off_next
- = (sect_offset) (extract_unsigned_integer
- (map.cu_table_reordered + i * map.offset_size,
- map.offset_size,
- map.dwarf5_byte_order));
- }
- else
- sect_off_next = (sect_offset) section.size;
- if (i >= 1)
- {
- if (sect_off_next == sect_off_prev)
- {
- warning (_("Section .debug_names has duplicate entry in CU table,"
- " ignoring .debug_names."));
- return false;
- }
- if (sect_off_next < sect_off_prev)
- {
- warning (_("Section .debug_names has non-ascending CU table,"
- " ignoring .debug_names."));
- return false;
- }
- /* Note: we're not using length = sect_off_next - sect_off_prev,
- to gracefully handle an incomplete CU list. */
- const ULONGEST length = 0;
- dwarf2_per_cu_data_up per_cu
- = create_cu_from_index_list (per_bfd, §ion, is_dwz,
- sect_off_prev, length);
- per_bfd->all_units.push_back (std::move (per_cu));
- }
- sect_off_prev = sect_off_next;
- }
-
- return true;
-}
-
-/* Read the CU list from the mapped index, and use it to create all
- the CU objects for this dwarf2_per_objfile. */
-
-static bool
-create_cus_from_debug_names (dwarf2_per_bfd *per_bfd,
- const mapped_debug_names &map,
- const mapped_debug_names &dwz_map)
-{
- gdb_assert (per_bfd->all_units.empty ());
- per_bfd->all_units.reserve (map.cu_count + dwz_map.cu_count);
-
- if (!create_cus_from_debug_names_list (per_bfd, map, per_bfd->info,
- false /* is_dwz */))
- return false;
-
- if (dwz_map.cu_count == 0)
- return true;
-
- dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
- return create_cus_from_debug_names_list (per_bfd, dwz_map, dwz->info,
- true /* is_dwz */);
-}
-
-/* Read .debug_names. If everything went ok, initialize the "quick"
- elements of all the CUs and return true. Otherwise, return false. */
-
-static bool
-dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile)
-{
- std::unique_ptr<mapped_debug_names> map (new mapped_debug_names);
- mapped_debug_names dwz_map;
- struct objfile *objfile = per_objfile->objfile;
- dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
-
- if (!read_debug_names_from_section (objfile, objfile_name (objfile),
- &per_bfd->debug_names, *map))
- return false;
-
- /* Don't use the index if it's empty. */
- if (map->name_count == 0)
- return false;
-
- /* If there is a .dwz file, read it so we can get its CU list as
- well. */
- dwz_file *dwz = dwarf2_get_dwz_file (per_bfd);
- if (dwz != NULL)
- {
- if (!read_debug_names_from_section (objfile,
- bfd_get_filename (dwz->dwz_bfd.get ()),
- &dwz->debug_names, dwz_map))
- {
- warning (_("could not read '.debug_names' section from %s; skipping"),
- bfd_get_filename (dwz->dwz_bfd.get ()));
- return false;
- }
- }
-
- if (!create_cus_from_debug_names (per_bfd, *map, dwz_map))
- {
- per_bfd->all_units.clear ();
- return false;
- }
-
- if (map->tu_count != 0)
- {
- /* We can only handle a single .debug_types when we have an
- index. */
- if (per_bfd->types.size () > 1)
- {
- per_bfd->all_units.clear ();
- return false;
- }
-
- dwarf2_section_info *section
- = (per_bfd->types.size () == 1
- ? &per_bfd->types[0]
- : &per_bfd->info);
-
- create_signatured_type_table_from_debug_names
- (per_objfile, *map, section, &per_bfd->abbrev);
- }
-
- finalize_all_units (per_bfd);
-
- create_addrmap_from_aranges (per_objfile, &per_bfd->debug_aranges);
-
- per_bfd->index_table = std::move (map);
- per_bfd->quick_file_names_table =
- create_quick_file_names_table (per_bfd->all_units.size ());
-
- return true;
-}
-
-/* Type used to manage iterating over all CUs looking for a symbol for
- .debug_names. */
-
-class dw2_debug_names_iterator
-{
-public:
- dw2_debug_names_iterator (const mapped_debug_names &map,
- block_search_flags block_index,
- domain_enum domain,
- const char *name, dwarf2_per_objfile *per_objfile)
- : m_map (map), m_block_index (block_index), m_domain (domain),
- m_addr (find_vec_in_debug_names (map, name, per_objfile)),
- m_per_objfile (per_objfile)
- {}
-
- dw2_debug_names_iterator (const mapped_debug_names &map,
- search_domain search, uint32_t namei,
- dwarf2_per_objfile *per_objfile,
- domain_enum domain = UNDEF_DOMAIN)
- : m_map (map),
- m_domain (domain),
- m_search (search),
- m_addr (find_vec_in_debug_names (map, namei, per_objfile)),
- m_per_objfile (per_objfile)
- {}
-
- dw2_debug_names_iterator (const mapped_debug_names &map,
- block_search_flags block_index, domain_enum domain,
- uint32_t namei, dwarf2_per_objfile *per_objfile)
- : m_map (map), m_block_index (block_index), m_domain (domain),
- m_addr (find_vec_in_debug_names (map, namei, per_objfile)),
- m_per_objfile (per_objfile)
- {}
-
- /* Return the next matching CU or NULL if there are no more. */
- dwarf2_per_cu_data *next ();
-
-private:
- static const gdb_byte *find_vec_in_debug_names (const mapped_debug_names &map,
- const char *name,
- dwarf2_per_objfile *per_objfile);
- static const gdb_byte *find_vec_in_debug_names (const mapped_debug_names &map,
- uint32_t namei,
- dwarf2_per_objfile *per_objfile);
-
- /* The internalized form of .debug_names. */
- const mapped_debug_names &m_map;
-
- /* Restrict the search to these blocks. */
- block_search_flags m_block_index = (SEARCH_GLOBAL_BLOCK
- | SEARCH_STATIC_BLOCK);
-
- /* The kind of symbol we're looking for. */
- const domain_enum m_domain = UNDEF_DOMAIN;
- const search_domain m_search = ALL_DOMAIN;
-
- /* The list of CUs from the index entry of the symbol, or NULL if
- not found. */
- const gdb_byte *m_addr;
-
- dwarf2_per_objfile *m_per_objfile;
-};
-
-const char *
-mapped_debug_names::namei_to_name
- (uint32_t namei, dwarf2_per_objfile *per_objfile) const
-{
- const ULONGEST namei_string_offs
- = extract_unsigned_integer ((name_table_string_offs_reordered
- + namei * offset_size),
- offset_size,
- dwarf5_byte_order);
- return read_indirect_string_at_offset (per_objfile, namei_string_offs);
-}
-
-/* Find a slot in .debug_names for the object named NAME. If NAME is
- found, return pointer to its pool data. If NAME cannot be found,
- return NULL. */
-
-const gdb_byte *
-dw2_debug_names_iterator::find_vec_in_debug_names
- (const mapped_debug_names &map, const char *name,
- dwarf2_per_objfile *per_objfile)
-{
- int (*cmp) (const char *, const char *);
-
- gdb::unique_xmalloc_ptr<char> without_params;
- if (current_language->la_language == language_cplus
- || current_language->la_language == language_fortran
- || current_language->la_language == language_d)
- {
- /* NAME is already canonical. Drop any qualifiers as
- .debug_names does not contain any. */
-
- if (strchr (name, '(') != NULL)
- {
- without_params = cp_remove_params (name);
- if (without_params != NULL)
- name = without_params.get ();
- }
- }
-
- cmp = (case_sensitivity == case_sensitive_on ? strcmp : strcasecmp);
-
- const uint32_t full_hash = dwarf5_djb_hash (name);
- uint32_t namei
- = extract_unsigned_integer (reinterpret_cast<const gdb_byte *>
- (map.bucket_table_reordered
- + (full_hash % map.bucket_count)), 4,
- map.dwarf5_byte_order);
- if (namei == 0)
- return NULL;
- --namei;
- if (namei >= map.name_count)
- {
- complaint (_("Wrong .debug_names with name index %u but name_count=%u "
- "[in module %s]"),
- namei, map.name_count,
- objfile_name (per_objfile->objfile));
- return NULL;
- }
-
- for (;;)
- {
- const uint32_t namei_full_hash
- = extract_unsigned_integer (reinterpret_cast<const gdb_byte *>
- (map.hash_table_reordered + namei), 4,
- map.dwarf5_byte_order);
- if (full_hash % map.bucket_count != namei_full_hash % map.bucket_count)
- return NULL;
-
- if (full_hash == namei_full_hash)
- {
- const char *const namei_string = map.namei_to_name (namei, per_objfile);
-
-#if 0 /* An expensive sanity check. */
- if (namei_full_hash != dwarf5_djb_hash (namei_string))
- {
- complaint (_("Wrong .debug_names hash for string at index %u "
- "[in module %s]"),
- namei, objfile_name (dwarf2_per_objfile->objfile));
- return NULL;
- }
-#endif
-
- if (cmp (namei_string, name) == 0)
- {
- const ULONGEST namei_entry_offs
- = extract_unsigned_integer ((map.name_table_entry_offs_reordered
- + namei * map.offset_size),
- map.offset_size, map.dwarf5_byte_order);
- return map.entry_pool + namei_entry_offs;
- }
- }
-
- ++namei;
- if (namei >= map.name_count)
- return NULL;
- }
-}
-
-const gdb_byte *
-dw2_debug_names_iterator::find_vec_in_debug_names
- (const mapped_debug_names &map, uint32_t namei, dwarf2_per_objfile *per_objfile)
-{
- if (namei >= map.name_count)
- {
- complaint (_("Wrong .debug_names with name index %u but name_count=%u "
- "[in module %s]"),
- namei, map.name_count,
- objfile_name (per_objfile->objfile));
- return NULL;
- }
-
- const ULONGEST namei_entry_offs
- = extract_unsigned_integer ((map.name_table_entry_offs_reordered
- + namei * map.offset_size),
- map.offset_size, map.dwarf5_byte_order);
- return map.entry_pool + namei_entry_offs;
-}
-
-/* See dw2_debug_names_iterator. */
-
-dwarf2_per_cu_data *
-dw2_debug_names_iterator::next ()
-{
- if (m_addr == NULL)
- return NULL;
-
- dwarf2_per_bfd *per_bfd = m_per_objfile->per_bfd;
- struct objfile *objfile = m_per_objfile->objfile;
- bfd *const abfd = objfile->obfd.get ();
-
- again:
-
- unsigned int bytes_read;
- const ULONGEST abbrev = read_unsigned_leb128 (abfd, m_addr, &bytes_read);
- m_addr += bytes_read;
- if (abbrev == 0)
- return NULL;
-
- const auto indexval_it = m_map.abbrev_map.find (abbrev);
- if (indexval_it == m_map.abbrev_map.cend ())
- {
- complaint (_("Wrong .debug_names undefined abbrev code %s "
- "[in module %s]"),
- pulongest (abbrev), objfile_name (objfile));
- return NULL;
- }
- const mapped_debug_names::index_val &indexval = indexval_it->second;
- enum class symbol_linkage {
- unknown,
- static_,
- extern_,
- } symbol_linkage_ = symbol_linkage::unknown;
- dwarf2_per_cu_data *per_cu = NULL;
- for (const mapped_debug_names::index_val::attr &attr : indexval.attr_vec)
- {
- ULONGEST ull;
- switch (attr.form)
- {
- case DW_FORM_implicit_const:
- ull = attr.implicit_const;
- break;
- case DW_FORM_flag_present:
- ull = 1;
- break;
- case DW_FORM_udata:
- ull = read_unsigned_leb128 (abfd, m_addr, &bytes_read);
- m_addr += bytes_read;
- break;
- case DW_FORM_ref4:
- ull = read_4_bytes (abfd, m_addr);
- m_addr += 4;
- break;
- case DW_FORM_ref8:
- ull = read_8_bytes (abfd, m_addr);
- m_addr += 8;
- break;
- case DW_FORM_ref_sig8:
- ull = read_8_bytes (abfd, m_addr);
- m_addr += 8;
- break;
- default:
- complaint (_("Unsupported .debug_names form %s [in module %s]"),
- dwarf_form_name (attr.form),
- objfile_name (objfile));
- return NULL;
- }
- switch (attr.dw_idx)
- {
- case DW_IDX_compile_unit:
- {
- /* Don't crash on bad data. */
- if (ull >= per_bfd->all_comp_units.size ())
- {
- complaint (_(".debug_names entry has bad CU index %s"
- " [in module %s]"),
- pulongest (ull),
- objfile_name (objfile));
- continue;
- }
- }
- per_cu = per_bfd->get_cu (ull);
- break;
- case DW_IDX_type_unit:
- /* Don't crash on bad data. */
- if (ull >= per_bfd->all_type_units.size ())
- {
- complaint (_(".debug_names entry has bad TU index %s"
- " [in module %s]"),
- pulongest (ull),
- objfile_name (objfile));
- continue;
- }
- {
- int nr_cus = per_bfd->all_comp_units.size ();
- per_cu = per_bfd->get_cu (nr_cus + ull);
- }
- break;
- case DW_IDX_die_offset:
- /* In a per-CU index (as opposed to a per-module index), index
- entries without CU attribute implicitly refer to the single CU. */
- if (per_cu == NULL)
- per_cu = per_bfd->get_cu (0);
- break;
- case DW_IDX_GNU_internal:
- if (!m_map.augmentation_is_gdb)
- break;
- symbol_linkage_ = symbol_linkage::static_;
- break;
- case DW_IDX_GNU_external:
- if (!m_map.augmentation_is_gdb)
- break;
- symbol_linkage_ = symbol_linkage::extern_;
- break;
- }
- }
-
- /* Skip if we couldn't find a valid CU/TU index. */
- if (per_cu == nullptr)
- goto again;
-
- /* Skip if already read in. */
- if (m_per_objfile->symtab_set_p (per_cu))
- goto again;
-
- /* Check static vs global. */
- if (symbol_linkage_ != symbol_linkage::unknown)
- {
- if (symbol_linkage_ == symbol_linkage::static_)
- {
- if ((m_block_index & SEARCH_STATIC_BLOCK) == 0)
- goto again;
- }
- else
- {
- if ((m_block_index & SEARCH_GLOBAL_BLOCK) == 0)
- goto again;
- }
- }
-
- /* Match dw2_symtab_iter_next, symbol_kind
- and debug_names::psymbol_tag. */
- switch (m_domain)
- {
- case VAR_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_variable:
- case DW_TAG_subprogram:
- /* Some types are also in VAR_DOMAIN. */
- case DW_TAG_typedef:
- case DW_TAG_structure_type:
- break;
- default:
- goto again;
- }
- break;
- case STRUCT_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_typedef:
- case DW_TAG_structure_type:
- break;
- default:
- goto again;
- }
- break;
- case LABEL_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case 0:
- case DW_TAG_variable:
- break;
- default:
- goto again;
- }
- break;
- case MODULE_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_module:
- break;
- default:
- goto again;
- }
- break;
- default:
- break;
- }
-
- /* Match dw2_expand_symtabs_matching, symbol_kind and
- debug_names::psymbol_tag. */
- switch (m_search)
- {
- case VARIABLES_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_variable:
- break;
- default:
- goto again;
- }
- break;
- case FUNCTIONS_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_subprogram:
- break;
- default:
- goto again;
- }
- break;
- case TYPES_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_typedef:
- case DW_TAG_structure_type:
- break;
- default:
- goto again;
- }
- break;
- case MODULES_DOMAIN:
- switch (indexval.dwarf_tag)
- {
- case DW_TAG_module:
- break;
- default:
- goto again;
- }
- default:
- break;
- }
-
- return per_cu;
-}
-
-/* This dumps minimal information about .debug_names. It is called
- via "mt print objfiles". The gdb.dwarf2/gdb-index.exp testcase
- uses this to verify that .debug_names has been loaded. */
-
-void
-dwarf2_debug_names_index::dump (struct objfile *objfile)
-{
- gdb_printf (".debug_names: exists\n");
-}
-
-void
-dwarf2_debug_names_index::expand_matching_symbols
- (struct objfile *objfile,
- const lookup_name_info &name, domain_enum domain,
- int global,
- symbol_compare_ftype *ordered_compare)
-{
- dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
-
- mapped_debug_names &map
- = *(gdb::checked_static_cast<mapped_debug_names *>
- (per_objfile->per_bfd->index_table.get ()));
- const block_search_flags block_flags
- = global ? SEARCH_GLOBAL_BLOCK : SEARCH_STATIC_BLOCK;
-
- const char *match_name = name.ada ().lookup_name ().c_str ();
- auto matcher = [&] (const char *symname)
- {
- if (ordered_compare == nullptr)
- return true;
- return ordered_compare (symname, match_name) == 0;
- };
-
- dw2_expand_symtabs_matching_symbol (map, name, matcher,
- [&] (offset_type namei)
- {
- /* The name was matched, now expand corresponding CUs that were
- marked. */
- dw2_debug_names_iterator iter (map, block_flags, domain, namei,
- per_objfile);
-
- struct dwarf2_per_cu_data *per_cu;
- while ((per_cu = iter.next ()) != NULL)
- dw2_expand_symtabs_matching_one (per_cu, per_objfile, nullptr,
- nullptr);
- return true;
- }, per_objfile);
-}
-
-bool
-dwarf2_debug_names_index::expand_symtabs_matching
- (struct objfile *objfile,
- gdb::function_view<expand_symtabs_file_matcher_ftype> file_matcher,
- const lookup_name_info *lookup_name,
- gdb::function_view<expand_symtabs_symbol_matcher_ftype> symbol_matcher,
- gdb::function_view<expand_symtabs_exp_notify_ftype> expansion_notify,
- block_search_flags search_flags,
- domain_enum domain,
- enum search_domain kind)
-{
- dwarf2_per_objfile *per_objfile = get_dwarf2_per_objfile (objfile);
-
- dw_expand_symtabs_matching_file_matcher (per_objfile, file_matcher);
-
- /* This invariant is documented in quick-functions.h. */
- gdb_assert (lookup_name != nullptr || symbol_matcher == nullptr);
- if (lookup_name == nullptr)
- {
- for (dwarf2_per_cu_data *per_cu
- : all_units_range (per_objfile->per_bfd))
- {
- QUIT;
-
- if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
- file_matcher,
- expansion_notify))
- return false;
- }
- return true;
- }
-
- mapped_debug_names &map
- = *(gdb::checked_static_cast<mapped_debug_names *>
- (per_objfile->per_bfd->index_table.get ()));
-
- bool result
- = dw2_expand_symtabs_matching_symbol (map, *lookup_name,
- symbol_matcher,
- [&] (offset_type namei)
- {
- /* The name was matched, now expand corresponding CUs that were
- marked. */
- dw2_debug_names_iterator iter (map, kind, namei, per_objfile, domain);
-
- struct dwarf2_per_cu_data *per_cu;
- while ((per_cu = iter.next ()) != NULL)
- if (!dw2_expand_symtabs_matching_one (per_cu, per_objfile,
- file_matcher,
- expansion_notify))
- return false;
- return true;
- }, per_objfile);
-
- return result;
-}
-
/* Get the content of the .gdb_index section of OBJ. SECTION_OWNER should point
to either a dwarf2_per_bfd or dwz_file object. */
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index b0e3020e50de..08654ae726c4 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -979,4 +979,12 @@ void finalize_all_units (dwarf2_per_bfd *per_bfd);
htab_up create_quick_file_names_table (unsigned int nr_initial_entries);
+/* Read the address map data from DWARF-5 .debug_aranges, and use it
+ to populate given addrmap. Returns true on success, false on
+ failure. */
+
+bool read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
+ dwarf2_section_info *section,
+ addrmap *mutable_map);
+
#endif /* DWARF2READ_H */
--
2.39.1
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 4/4] gdb/dwarf2: split .debug_names reading code to own file
2023-02-13 14:55 ` [PATCH 4/4] gdb/dwarf2: split .debug_names " Simon Marchi
@ 2023-02-13 23:38 ` Tom Tromey
0 siblings, 0 replies; 13+ messages in thread
From: Tom Tromey @ 2023-02-13 23:38 UTC (permalink / raw)
To: Simon Marchi via Gdb-patches; +Cc: Simon Marchi
>>>>> "Simon" == Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> writes:
Simon> Move everything related to reading .debug_names from read.c to
Simon> read-debug-names.c. The only entry point exposed by
Simon> read-debug-names.{c,h} is dwarf2_read_debug_names.
Makes sense to me. Thanks for doing this.
Approved-By: Tom Tromey <tom@tromey.com>
Tom
^ permalink raw reply [flat|nested] 13+ messages in thread