From 701823751bec1bbf2f1c96463994f894d33d2238 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 20 Mar 2021 17:23:40 -0600 Subject: [PATCH] Introduce dwarf2/public.h This moves some more DWARF code out of symfile.h and into a new header, dwarf2/public.h. This header is intended to describe the public API of the DWARF reader. gdb/ChangeLog 2021-03-20 Tom Tromey * coffread.c: Include dwarf2/public.h. * dwarf2/frame.c: Include dwarf2/public.h. * dwarf2/index-write.h: Include dwarf2/public.h, not symfile.h. * dwarf2/public.h: New file. * dwarf2/read.c: Include dwarf2/public.h. * elfread.c: Include dwarf2/public.h. * machoread.c: Include dwarf2/public.h. * symfile.h (dwarf2_has_info, enum dw_index_kind) (dwarf2_initialize_objfile, dwarf2_build_psymtabs) (dwarf2_build_frame_info): Move to dwarf2/public.h. * xcoffread.c: Include dwarf2/public.h. --- gdb/ChangeLog | 14 ++++++++++++ gdb/coffread.c | 1 + gdb/dwarf2/frame.c | 1 + gdb/dwarf2/index-write.h | 2 +- gdb/dwarf2/public.h | 46 ++++++++++++++++++++++++++++++++++++++++ gdb/dwarf2/read.c | 1 + gdb/elfread.c | 1 + gdb/machoread.c | 1 + gdb/symfile.h | 26 ----------------------- gdb/xcoffread.c | 1 + 10 files changed, 67 insertions(+), 27 deletions(-) create mode 100644 gdb/dwarf2/public.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5509d39d101..b06b6d23b66 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +2021-03-20 Tom Tromey + + * coffread.c: Include dwarf2/public.h. + * dwarf2/frame.c: Include dwarf2/public.h. + * dwarf2/index-write.h: Include dwarf2/public.h, not symfile.h. + * dwarf2/public.h: New file. + * dwarf2/read.c: Include dwarf2/public.h. + * elfread.c: Include dwarf2/public.h. + * machoread.c: Include dwarf2/public.h. + * symfile.h (dwarf2_has_info, enum dw_index_kind) + (dwarf2_initialize_objfile, dwarf2_build_psymtabs) + (dwarf2_build_frame_info): Move to dwarf2/public.h. + * xcoffread.c: Include dwarf2/public.h. + 2021-03-20 Tom Tromey * symfile.h (enum dwarf2_section_enum) diff --git a/gdb/coffread.c b/gdb/coffread.c index 49a2485d38c..d15ba6593fc 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -36,6 +36,7 @@ #include "target.h" #include "block.h" #include "dictionary.h" +#include "dwarf2/public.h" #include "coff-pe-read.h" diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index 4d62b197d3a..f8612c96f27 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -37,6 +37,7 @@ #include "complaints.h" #include "dwarf2/frame.h" #include "dwarf2/read.h" +#include "dwarf2/public.h" #include "ax.h" #include "dwarf2/loc.h" #include "dwarf2/frame-tailcall.h" diff --git a/gdb/dwarf2/index-write.h b/gdb/dwarf2/index-write.h index 5f6761c91a7..27f1f03cd8b 100644 --- a/gdb/dwarf2/index-write.h +++ b/gdb/dwarf2/index-write.h @@ -20,8 +20,8 @@ #ifndef DWARF_INDEX_WRITE_H #define DWARF_INDEX_WRITE_H -#include "symfile.h" #include "dwarf2/read.h" +#include "dwarf2/public.h" /* Create index files for OBJFILE in the directory DIR. diff --git a/gdb/dwarf2/public.h b/gdb/dwarf2/public.h new file mode 100644 index 00000000000..d0182d4e673 --- /dev/null +++ b/gdb/dwarf2/public.h @@ -0,0 +1,46 @@ +/* Public API for gdb DWARF reader + + Copyright (C) 2021 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 . */ + +#ifndef DWARF2_PUBLIC_H +#define DWARF2_PUBLIC_H + +extern int dwarf2_has_info (struct objfile *, + const struct dwarf2_debug_sections *, + bool = false); + +/* A DWARF names index variant. */ +enum class dw_index_kind +{ + /* GDB's own .gdb_index format. */ + GDB_INDEX, + + /* DWARF5 .debug_names. */ + DEBUG_NAMES, +}; + +/* Initialize for reading DWARF for OBJFILE. Return false if this + file will use psymtabs, or true if using an index, in which case + *INDEX_KIND is set to the index variant in use. */ +extern bool dwarf2_initialize_objfile (struct objfile *objfile, + dw_index_kind *index_kind); + +extern void dwarf2_build_psymtabs (struct objfile *); +extern void dwarf2_build_frame_info (struct objfile *); + +#endif /* DWARF2_PUBLIC_H */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index d6881300fa6..4d6d87b2e5e 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -42,6 +42,7 @@ #include "dwarf2/die.h" #include "dwarf2/sect-names.h" #include "dwarf2/stringify.h" +#include "dwarf2/public.h" #include "bfd.h" #include "elf-bfd.h" #include "symtab.h" diff --git a/gdb/elfread.c b/gdb/elfread.c index ce63d6b4b56..8f06c8edc79 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -51,6 +51,7 @@ #include "gdbsupport/gdb_string_view.h" #include "gdbsupport/scoped_fd.h" #include "debuginfod-support.h" +#include "dwarf2/public.h" /* Forward declarations. */ extern const struct sym_fns elf_sym_fns_gdb_index; diff --git a/gdb/machoread.c b/gdb/machoread.c index 0ff61e12f5a..ff50ae54f2a 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -32,6 +32,7 @@ #include "gdb_bfd.h" #include #include +#include "dwarf2/public.h" /* If non-zero displays debugging message. */ static unsigned int mach_o_debug_level = 0; diff --git a/gdb/symfile.h b/gdb/symfile.h index 5a5b4c4ac3b..da49911c5cf 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -552,32 +552,6 @@ void map_symbol_filenames (symbol_filename_ftype *fun, void *data, optional offset to apply to each section. */ extern void generic_load (const char *args, int from_tty); -/* From dwarf2read.c */ - -struct dwarf2_debug_sections; -extern int dwarf2_has_info (struct objfile *, - const struct dwarf2_debug_sections *, - bool = false); - -/* A DWARF names index variant. */ -enum class dw_index_kind -{ - /* GDB's own .gdb_index format. */ - GDB_INDEX, - - /* DWARF5 .debug_names. */ - DEBUG_NAMES, -}; - -/* Initialize for reading DWARF for OBJFILE. Return false if this - file will use psymtabs, or true if using an index, in which case - *INDEX_KIND is set to the index variant in use. */ -extern bool dwarf2_initialize_objfile (struct objfile *objfile, - dw_index_kind *index_kind); - -extern void dwarf2_build_psymtabs (struct objfile *); -extern void dwarf2_build_frame_info (struct objfile *); - /* From minidebug.c. */ extern gdb_bfd_ref_ptr find_separate_debug_file_in_section (struct objfile *); diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index b1768702e26..612ffb178c5 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -48,6 +48,7 @@ #include "complaints.h" #include "psympriv.h" #include "dwarf2/sect-names.h" +#include "dwarf2/public.h" #include "gdb-stabs.h" -- 2.30.2