[4/6] Code cleanup: dwarf2_initialize_objfile return value
Commit Message
Hi,
dwarf2_initialize_objfile was returning boolean whether it is psymtabs or
.gdb_index while now it needs to return also whether it is .debug_names.
Jan
gdb/ChangeLog
2017-05-26 Jan Kratochvil <jan.kratochvil@redhat.com>
* defs.h (elf_sym_fns_lazy_psyms, elf_sym_fns_gdb_index): Move here
declarations from elfread.c.
(dwarf2_initialize_objfile): Change return value.
* elfread.c (elf_sym_fns_lazy_psyms, elf_sym_fns_gdb_index): Move these
declarations to defs.h.
(elf_symfile_read): Adjust dwarf2_initialize_objfile caller.
* symfile.h (dwarf2_initialize_objfile): Change return type.
---
gdb/defs.h | 5 +++++
gdb/dwarf2read.c | 8 ++++----
gdb/elfread.c | 11 +++--------
gdb/symfile.h | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
@@ -724,6 +724,11 @@ 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;
+
/* * Special block numbers */
enum block_enum
@@ -4354,7 +4354,7 @@ const struct quick_symbol_functions dwarf2_gdb_index_functions =
/* Initialize for reading DWARF for this objfile. Return 0 if this
file will use psymtabs, or 1 if using the GNU index. */
-int
+const sym_fns &
dwarf2_initialize_objfile (struct objfile *objfile)
{
/* If we're about to read full symbols, don't bother with the
@@ -4383,13 +4383,13 @@ 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 1;
+ return elf_sym_fns_gdb_index;
}
if (dwarf2_read_index (objfile))
- return 1;
+ return elf_sym_fns_gdb_index;
- return 0;
+ return elf_sym_fns_lazy_psyms;
}
@@ -50,10 +50,6 @@
extern void _initialize_elfread (void);
-/* Forward declarations. */
-extern const struct sym_fns elf_sym_fns_gdb_index;
-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. */
@@ -1237,10 +1233,7 @@ elf_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags)
information present in OBJFILE. If there is such debug info present
never use .gdb_index. */
- if (!objfile_has_partial_symbols (objfile)
- && dwarf2_initialize_objfile (objfile))
- objfile_set_sym_fns (objfile, &elf_sym_fns_gdb_index);
- else
+ if (objfile_has_partial_symbols (objfile))
{
/* It is ok to do this even if the stabs reader made some
partial symbols, because OBJF_PSYMTABS_READ has not been
@@ -1248,6 +1241,8 @@ 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
@@ -625,7 +625,7 @@ extern void dwarf2_get_section_info (struct objfile *,
asection **, const gdb_byte **,
bfd_size_type *);
-extern int dwarf2_initialize_objfile (struct objfile *);
+extern const sym_fns &dwarf2_initialize_objfile (struct objfile *);
extern void dwarf2_build_psymtabs (struct objfile *);
extern void dwarf2_build_frame_info (struct objfile *);