public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] Introduce and use dwarf_scanner_base
@ 2022-04-20 15:12 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-04-20 15:12 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6606799fc4aaf812d0986166f57c9849b5d562ed
commit 6606799fc4aaf812d0986166f57c9849b5d562ed
Author: Tom Tromey <tom@tromey.com>
Date: Mon Nov 22 16:43:47 2021 -0700
Introduce and use dwarf_scanner_base
This introduces dwarf_scanner_base, a base class for all the index
readers in the DWARF code. Then, it changes both mapped_index_base
and cooked_index_vector to derive from this new base class.
Diff:
---
gdb/dwarf2/cooked-index.h | 5 ++++-
gdb/dwarf2/mapped-index.h | 20 ++++++++++++++------
gdb/dwarf2/read.c | 9 ++++++++-
3 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index 4b52eaf93d0..e1ff05645c5 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -31,6 +31,7 @@
#include "addrmap.h"
#include "gdbsupport/iterator-range.h"
#include "gdbsupport/thread-pool.h"
+#include "dwarf2/mapped-index.h"
struct dwarf2_per_cu_data;
@@ -241,7 +242,7 @@ private:
cooked_index_vector for storage and final indexing. The index is
made by iterating over the entries previously created. */
-class cooked_index_vector
+class cooked_index_vector : public dwarf_scanner_base
{
public:
@@ -291,6 +292,8 @@ public:
"main". This will return NULL if no such entry is available. */
const cooked_index_entry *get_main () const;
+ quick_symbol_functions_up make_quick_functions () const override;
+
private:
/* GNAT only emits mangled ("encoded") names in the DWARF, and does
diff --git a/gdb/dwarf2/mapped-index.h b/gdb/dwarf2/mapped-index.h
index 9f51a9e6578..39a9ede4896 100644
--- a/gdb/dwarf2/mapped-index.h
+++ b/gdb/dwarf2/mapped-index.h
@@ -47,13 +47,25 @@ struct name_component
offset_type idx;
};
+/* Base class of all DWARF scanner types. */
+
+struct dwarf_scanner_base
+{
+ dwarf_scanner_base () = default;
+ virtual ~dwarf_scanner_base () = default;
+ DISABLE_COPY_AND_ASSIGN (dwarf_scanner_base);
+
+ /* Return a quick_symbol_functions instance that refers back to this
+ dwarf_scanner_base. */
+ virtual quick_symbol_functions_up make_quick_functions () const = 0;
+};
+
/* Base class containing bits shared by both .gdb_index and
.debug_name indexes. */
-struct mapped_index_base
+struct mapped_index_base : public dwarf_scanner_base
{
mapped_index_base () = default;
- virtual ~mapped_index_base() = default;
DISABLE_COPY_AND_ASSIGN (mapped_index_base);
/* The name_component table (a sorted vector). See name_component's
@@ -77,10 +89,6 @@ struct mapped_index_base
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
yet. */
void build_name_components (dwarf2_per_objfile *per_objfile);
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 83651f21d31..3053ec9b303 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -5301,7 +5301,8 @@ dwarf2_initialize_objfile (struct objfile *objfile)
if (per_bfd->cooked_index_table != nullptr)
{
dwarf_read_debug_printf ("re-using cooked index table");
- objfile->qf.push_front (make_cooked_index_funcs ());
+ objfile->qf.push_front
+ (per_bfd->cooked_index_table->make_quick_functions ());
return;
}
@@ -18682,6 +18683,12 @@ make_cooked_index_funcs ()
return quick_symbol_functions_up (new cooked_index_functions);
}
+quick_symbol_functions_up
+cooked_index_vector::make_quick_functions () const
+{
+ return make_cooked_index_funcs ();
+}
+
\f
/* Read the .debug_loclists or .debug_rnglists header (they are the same format)
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-04-20 15:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-20 15:12 [binutils-gdb] Introduce and use dwarf_scanner_base Tom Tromey
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).