FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Let mapped index classes create the quick_symbol_functions object

Browse source 
This changes the mapped index classes to create the
quick_symbol_functions objects.  This is a step toward having a more
abstract interface to mapped indices.
This commit is contained in:
Tom Tromey 2021-03-29 17:58:21 -06:00
parent 6555809e3e
commit 32ae6b930c
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gdb/dwarf2/mapped-index.h
View file

@ -77,6 +77,10 @@ struct mapped_index_base
return false; return false;
} }
/* Return a quick_symbol_functions instance that refers back to this
mapped_index_base. */
virtual quick_symbol_functions_up make_quick_functions () const = 0;
/* Build the symbol name component sorted vector, if we haven't /* Build the symbol name component sorted vector, if we haven't
yet. */ yet. */
void build_name_components (dwarf2_per_objfile *per_objfile); void build_name_components (dwarf2_per_objfile *per_objfile);

31
gdb/dwarf2/read.c
View file

@ -243,6 +243,8 @@ struct mapped_index final : public mapped_index_base
size_t symbol_name_count () const override size_t symbol_name_count () const override
{ return this->symbol_table.size () / 2; } { return this->symbol_table.size () / 2; }
quick_symbol_functions_up make_quick_functions () const override;
}; };
/* A description of the mapped .debug_names. /* A description of the mapped .debug_names.
@ -292,6 +294,8 @@ struct mapped_debug_names final : public mapped_index_base
size_t symbol_name_count () const override size_t symbol_name_count () const override
{ return this->name_count; } { return this->name_count; }
quick_symbol_functions_up make_quick_functions () const override;
}; };
/* See dwarf2/read.h. */ /* See dwarf2/read.h. */
@ -1887,8 +1891,14 @@ make_dwarf_gdb_index ()
return quick_symbol_functions_up (new dwarf2_gdb_index); return quick_symbol_functions_up (new dwarf2_gdb_index);
} }
static quick_symbol_functions_up quick_symbol_functions_up
make_dwarf_debug_names () mapped_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
{ {
return quick_symbol_functions_up (new dwarf2_debug_names_index); return quick_symbol_functions_up (new dwarf2_debug_names_index);
} }
@ -3494,6 +3504,11 @@ public:
return m_symbol_table[idx]; return m_symbol_table[idx];
} }
quick_symbol_functions_up make_quick_functions () const override
{
return nullptr;
}
private: private:
gdb::array_view<const char *> m_symbol_table; gdb::array_view<const char *> m_symbol_table;
}; };
@ -5281,7 +5296,8 @@ dwarf2_initialize_objfile (struct objfile *objfile)
if (per_bfd->debug_names_table != nullptr) if (per_bfd->debug_names_table != nullptr)
{ {
dwarf_read_debug_printf ("re-using shared debug names table"); dwarf_read_debug_printf ("re-using shared debug names table");
objfile->qf.push_front (make_dwarf_debug_names ()); objfile->qf.push_front
(per_bfd->debug_names_table->make_quick_functions ());
return; return;
} }
@ -5290,7 +5306,7 @@ dwarf2_initialize_objfile (struct objfile *objfile)
if (per_bfd->index_table != nullptr) if (per_bfd->index_table != nullptr)
{ {
dwarf_read_debug_printf ("re-using shared index table"); dwarf_read_debug_printf ("re-using shared index table");
objfile->qf.push_front (make_dwarf_gdb_index ()); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ());
return; return;
} }
@ -5304,7 +5320,8 @@ dwarf2_initialize_objfile (struct objfile *objfile)
if (dwarf2_read_debug_names (per_objfile)) if (dwarf2_read_debug_names (per_objfile))
{ {
dwarf_read_debug_printf ("found debug names"); dwarf_read_debug_printf ("found debug names");
objfile->qf.push_front (make_dwarf_debug_names ()); objfile->qf.push_front
(per_bfd->debug_names_table->make_quick_functions ());
return; return;
} }
@ -5313,7 +5330,7 @@ dwarf2_initialize_objfile (struct objfile *objfile)
get_gdb_index_contents_from_section<dwz_file>)) get_gdb_index_contents_from_section<dwz_file>))
{ {
dwarf_read_debug_printf ("found gdb index from file"); dwarf_read_debug_printf ("found gdb index from file");
objfile->qf.push_front (make_dwarf_gdb_index ()); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ());
return; return;
} }
@ -5324,7 +5341,7 @@ dwarf2_initialize_objfile (struct objfile *objfile)
{ {
dwarf_read_debug_printf ("found gdb index from cache"); dwarf_read_debug_printf ("found gdb index from cache");
global_index_cache.hit (); global_index_cache.hit ();
objfile->qf.push_front (make_dwarf_gdb_index ()); objfile->qf.push_front (per_bfd->index_table->make_quick_functions ());
return; return;
} }