From c2a62a3d8833b824e8f0e36b6a03f348d7d1cd5a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 6 Mar 2021 09:26:39 -0700 Subject: [PATCH] Create new file dwarf2/sect-names.h This creates a new file, dwarf2/sect-names.h, and moves some DWARF-specific type definitions from symfile.h into it. gdb/ChangeLog 2021-03-06 Tom Tromey * xcoffread.c: Include sect-names.h. * symfile.h (struct dwarf2_section_names, struct dwarf2_debug_sections): Move to dwarf2/sect-names.h. * dwarf2/sect-names.h: New file, from symfile.h. * dwarf2/read.c: Include sect-names.h. --- gdb/ChangeLog | 8 +++++ gdb/dwarf2/read.c | 1 + gdb/dwarf2/sect-names.h | 68 +++++++++++++++++++++++++++++++++++++++++ gdb/symfile.h | 46 +--------------------------- gdb/xcoffread.c | 1 + 5 files changed, 79 insertions(+), 45 deletions(-) create mode 100644 gdb/dwarf2/sect-names.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 91b7a68894f..0ecaf620cfc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2021-03-06 Tom Tromey + + * xcoffread.c: Include sect-names.h. + * symfile.h (struct dwarf2_section_names, struct + dwarf2_debug_sections): Move to dwarf2/sect-names.h. + * dwarf2/sect-names.h: New file, from symfile.h. + * dwarf2/read.c: Include sect-names.h. + 2021-03-06 Tom Tromey * dwarf2/read.c (read_attribute): Make 'abbrev' const. diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index f129ea65978..4f629805417 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -40,6 +40,7 @@ #include "dwarf2/dwz.h" #include "dwarf2/macro.h" #include "dwarf2/die.h" +#include "dwarf2/sect-names.h" #include "dwarf2/stringify.h" #include "bfd.h" #include "elf-bfd.h" diff --git a/gdb/dwarf2/sect-names.h b/gdb/dwarf2/sect-names.h new file mode 100644 index 00000000000..63cf2cafef7 --- /dev/null +++ b/gdb/dwarf2/sect-names.h @@ -0,0 +1,68 @@ +/* DWARF 2 section names. + + Copyright (C) 1990-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 GDB_DWARF2_SECT_NAMES_H +#define GDB_DWARF2_SECT_NAMES_H + +/* Names for a dwarf2 debugging section. The field NORMAL is the normal + section name (usually from the DWARF standard), while the field COMPRESSED + is the name of compressed sections. If your object file format doesn't + support compressed sections, the field COMPRESSED can be NULL. Likewise, + the debugging section is not supported, the field NORMAL can be NULL too. + It doesn't make sense to have a NULL NORMAL field but a non-NULL COMPRESSED + field. */ + +struct dwarf2_section_names { + const char *normal; + const char *compressed; +}; + +/* List of names for dward2 debugging sections. Also most object file formats + use the standardized (ie ELF) names, some (eg XCOFF) have customized names + due to restrictions. + The table for the standard names is defined in dwarf2read.c. Please + update all instances of dwarf2_debug_sections if you add a field to this + structure. It is always safe to use { NULL, NULL } in this case. */ + +struct dwarf2_debug_sections { + struct dwarf2_section_names info; + struct dwarf2_section_names abbrev; + struct dwarf2_section_names line; + struct dwarf2_section_names loc; + struct dwarf2_section_names loclists; + struct dwarf2_section_names macinfo; + struct dwarf2_section_names macro; + struct dwarf2_section_names str; + struct dwarf2_section_names str_offsets; + struct dwarf2_section_names line_str; + struct dwarf2_section_names ranges; + struct dwarf2_section_names rnglists; + struct dwarf2_section_names types; + struct dwarf2_section_names addr; + struct dwarf2_section_names frame; + struct dwarf2_section_names eh_frame; + struct dwarf2_section_names gdb_index; + struct dwarf2_section_names debug_names; + struct dwarf2_section_names debug_aranges; + /* This field has no meaning, but exists solely to catch changes to + this structure which are not reflected in some instance. */ + int sentinel; +}; + +#endif /* GDB_DWARF2_SECT_NAMES_H */ diff --git a/gdb/symfile.h b/gdb/symfile.h index 23e2ad8c3a9..7f5545dc5ba 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -554,51 +554,7 @@ extern void generic_load (const char *args, int from_tty); /* From dwarf2read.c */ -/* Names for a dwarf2 debugging section. The field NORMAL is the normal - section name (usually from the DWARF standard), while the field COMPRESSED - is the name of compressed sections. If your object file format doesn't - support compressed sections, the field COMPRESSED can be NULL. Likewise, - the debugging section is not supported, the field NORMAL can be NULL too. - It doesn't make sense to have a NULL NORMAL field but a non-NULL COMPRESSED - field. */ - -struct dwarf2_section_names { - const char *normal; - const char *compressed; -}; - -/* List of names for dward2 debugging sections. Also most object file formats - use the standardized (ie ELF) names, some (eg XCOFF) have customized names - due to restrictions. - The table for the standard names is defined in dwarf2read.c. Please - update all instances of dwarf2_debug_sections if you add a field to this - structure. It is always safe to use { NULL, NULL } in this case. */ - -struct dwarf2_debug_sections { - struct dwarf2_section_names info; - struct dwarf2_section_names abbrev; - struct dwarf2_section_names line; - struct dwarf2_section_names loc; - struct dwarf2_section_names loclists; - struct dwarf2_section_names macinfo; - struct dwarf2_section_names macro; - struct dwarf2_section_names str; - struct dwarf2_section_names str_offsets; - struct dwarf2_section_names line_str; - struct dwarf2_section_names ranges; - struct dwarf2_section_names rnglists; - struct dwarf2_section_names types; - struct dwarf2_section_names addr; - struct dwarf2_section_names frame; - struct dwarf2_section_names eh_frame; - struct dwarf2_section_names gdb_index; - struct dwarf2_section_names debug_names; - struct dwarf2_section_names debug_aranges; - /* This field has no meaning, but exists solely to catch changes to - this structure which are not reflected in some instance. */ - int sentinel; -}; - +struct dwarf2_debug_sections; extern int dwarf2_has_info (struct objfile *, const struct dwarf2_debug_sections *, bool = false); diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index cd93943a812..b1768702e26 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -47,6 +47,7 @@ #include "expression.h" #include "complaints.h" #include "psympriv.h" +#include "dwarf2/sect-names.h" #include "gdb-stabs.h" -- 2.30.2