diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 16 | ||||
| -rw-r--r-- | gdb/defs.h | 6 | ||||
| -rw-r--r-- | gdb/dwarf2read.c | 32 | ||||
| -rw-r--r-- | gdb/elfread.c | 29 | ||||
| -rw-r--r-- | gdb/symfile.h | 17 |
5 files changed, 69 insertions, 31 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b3c5b97..78fd713 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,19 @@ +2017-12-11 Pedro Alves <palves@redhat.com> + + * defs.h (elf_sym_fns_lazy_psyms, elf_sym_fns_gdb_index) + (elf_sym_fns_debug_names): Move to elfread.c. + * dwarf2read.c (dwarf2_initialize_objfile): Return a boolean + instead of a sym_fns and add 'index_kind' output parameter. Fill + the latter in with the index variant kind if using an index. + (enum dw_index_kind): Moved to symfile.h. + * elfread.c (elf_sym_fns_gdb_index, elf_sym_fns_debug_names) + (elf_sym_fns_lazy_psyms): Move from defs.h. + (elf_symfile_read): Adjust to new dwarf2_initialize_objfile + interface. + * symfile.h (enum class dw_index_kind): New, moved from + dwarf2read.c. + (dwarf2_initialize_objfile): Change prototype. + 2017-12-11 Ulrich Weigand <uweigand@de.ibm.com> * target-float.c (mpfr_float_ops::from_target): Use mpfr_set_ui @@ -679,12 +679,6 @@ extern int (*deprecated_ui_load_progress_hook) (const char *section, extern void initialize_progspace (void); extern void initialize_inferiors (void); -/* From elfread.c */ - -extern const struct sym_fns elf_sym_fns_lazy_psyms; -extern const struct sym_fns elf_sym_fns_gdb_index; -extern const struct sym_fns elf_sym_fns_debug_names; - /* * Special block numbers */ enum block_enum diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 2aeb506..b4e60a4 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -6451,11 +6451,10 @@ const struct quick_symbol_functions dwarf2_debug_names_functions = dw2_map_symbol_filenames }; -/* Initialize for reading DWARF for this objfile. Return 0 if this - file will use psymtabs, or 1 if using the GNU index. */ +/* See symfile.h. */ -const sym_fns & -dwarf2_initialize_objfile (struct objfile *objfile) +bool +dwarf2_initialize_objfile (struct objfile *objfile, dw_index_kind *index_kind) { /* If we're about to read full symbols, don't bother with the indices. In this case we also don't care if some other debug @@ -6483,16 +6482,23 @@ dwarf2_initialize_objfile (struct objfile *objfile) /* Return 1 so that gdb sees the "quick" functions. However, these functions will be no-ops because we will have expanded all symtabs. */ - return elf_sym_fns_gdb_index; + *index_kind = dw_index_kind::GDB_INDEX; + return true; } if (dwarf2_read_debug_names (objfile)) - return elf_sym_fns_debug_names; + { + *index_kind = dw_index_kind::DEBUG_NAMES; + return true; + } if (dwarf2_read_index (objfile)) - return elf_sym_fns_gdb_index; + { + *index_kind = dw_index_kind::GDB_INDEX; + return true; + } - return elf_sym_fns_lazy_psyms; + return false; } @@ -26799,16 +26805,6 @@ assert_file_size (FILE *file, const char *filename, size_t expected_size) gdb_assert (file_size == expected_size); } -/* An index variant. */ -enum dw_index_kind -{ - /* GDB's own .gdb_index format. */ - GDB_INDEX, - - /* DWARF5 .debug_names. */ - DEBUG_NAMES, -}; - /* Create an index file for OBJFILE in the directory DIR. */ static void diff --git a/gdb/elfread.c b/gdb/elfread.c index 31288a9..7a41c26 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -48,6 +48,11 @@ #include "location.h" #include "auxv.h" +/* Forward declarations. */ +extern const struct sym_fns elf_sym_fns_gdb_index; +extern const struct sym_fns elf_sym_fns_debug_names; +extern const struct sym_fns elf_sym_fns_lazy_psyms; + /* The struct elfinfo is available only during ELF symbol table and psymtab reading. It is destroyed at the completion of psymtab-reading. It's local to elf_symfile_read. */ @@ -1211,11 +1216,25 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) if (dwarf2_has_info (objfile, NULL)) { - /* elf_sym_fns_gdb_index cannot handle simultaneous non-DWARF debug - information present in OBJFILE. If there is such debug info present - never use .gdb_index. */ + dw_index_kind index_kind; - if (objfile_has_partial_symbols (objfile)) + /* elf_sym_fns_gdb_index cannot handle simultaneous non-DWARF + debug information present in OBJFILE. If there is such debug + info present never use an index. */ + if (!objfile_has_partial_symbols (objfile) + && dwarf2_initialize_objfile (objfile, &index_kind)) + { + switch (index_kind) + { + case dw_index_kind::GDB_INDEX: + objfile_set_sym_fns (objfile, &elf_sym_fns_gdb_index); + break; + case dw_index_kind::DEBUG_NAMES: + objfile_set_sym_fns (objfile, &elf_sym_fns_debug_names); + break; + } + } + else { /* It is ok to do this even if the stabs reader made some partial symbols, because OBJF_PSYMTABS_READ has not been @@ -1223,8 +1242,6 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) when needed. */ objfile_set_sym_fns (objfile, &elf_sym_fns_lazy_psyms); } - else - objfile_set_sym_fns (objfile, &dwarf2_initialize_objfile (objfile)); } /* If the file has its own symbol tables it has no separate debug info. `.dynsym'/`.symtab' go to MSYMBOLS, `.debug_info' goes to diff --git a/gdb/symfile.h b/gdb/symfile.h index e903c60..93fbe68 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -603,7 +603,22 @@ extern void dwarf2_get_section_info (struct objfile *, asection **, const gdb_byte **, bfd_size_type *); -extern const sym_fns &dwarf2_initialize_objfile (struct objfile *); +/* 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 *); |