[v3,3/5] Code cleanup: dwarf2_initialize_objfile return value
Commit Message
On 06/19/2017 09:55 PM, Jan Kratochvil wrote:
> 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.
I could argue it's a step backward for exposing ELF details to the
DWARF code. There's no reason AFAIK that .gdb_index and/or .debug_names
couldn't be made to work with COFF/PE for example.
But we can cross that bridge when we come to it. I've pushed
this in as is, except I removed the "code cleanup" from the
subject. :-)
From abccd1e7b7a37385159610ca4e0bc2632a547e9a Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri, 8 Dec 2017 22:44:11 +0000
Subject: [PATCH 3/9] Change dwarf2_initialize_objfile's return value
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.
gdb/ChangeLog
2017-12-08 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/ChangeLog | 10 ++++++++++
gdb/defs.h | 5 +++++
gdb/dwarf2read.c | 8 ++++----
gdb/elfread.c | 11 +++--------
gdb/symfile.h | 2 +-
5 files changed, 23 insertions(+), 13 deletions(-)
Comments
On Fri, Dec 8, 2017 at 11:52 PM, Pedro Alves <palves@redhat.com> wrote:
> diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
> index a9daf1f..798af72 100644
> --- a/gdb/dwarf2read.c
> +++ b/gdb/dwarf2read.c
> @@ -5291,7 +5291,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
> @@ -5320,13 +5320,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;
> }
>
This breaks the arm-wince-pe build,
dwarf2read.o: In function `dwarf2_initialize_objfile(objfile*)':
/home/yao.qi/SourceCode/gnu/binutils-gdb/gdb/dwarf2read.c:6486:
undefined reference to `elf_sym_fns_gdb_index'
/home/yao.qi/SourceCode/gnu/binutils-gdb/gdb/dwarf2read.c:6490:
undefined reference to `elf_sym_fns_debug_names'
/home/yao.qi/SourceCode/gnu/binutils-gdb/gdb/dwarf2read.c:6495:
undefined reference to `elf_sym_fns_lazy_psyms'
collect2: error: ld returned 1 exit status
Makefile:1920: recipe for target 'gdb' failed
https://ci.linaro.org/job/tcwg-binutils/4395/
On 12/11/2017 01:03 PM, Yao Qi wrote:
> This breaks the arm-wince-pe build,
>
> dwarf2read.o: In function `dwarf2_initialize_objfile(objfile*)':
> /home/yao.qi/SourceCode/gnu/binutils-gdb/gdb/dwarf2read.c:6486:
> undefined reference to `elf_sym_fns_gdb_index'
> /home/yao.qi/SourceCode/gnu/binutils-gdb/gdb/dwarf2read.c:6490:
> undefined reference to `elf_sym_fns_debug_names'
> /home/yao.qi/SourceCode/gnu/binutils-gdb/gdb/dwarf2read.c:6495:
> undefined reference to `elf_sym_fns_lazy_psyms'
> collect2: error: ld returned 1 exit status
> Makefile:1920: recipe for target 'gdb' failed
>
> https://ci.linaro.org/job/tcwg-binutils/4395/
>
Eh, looks like the bridge was closer than I realized... I forgot
the non-elf ports don't include elfread.c in the build. So we
really need to do something else here. Maybe an enum instead of
the original boolean.
Thanks,
Pedro Alves
@@ -1,4 +1,14 @@
2017-12-08 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.
+
+2017-12-08 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <palves@redhat.com>
* contrib/gdb-add-index.sh (index): Rename to ...
@@ -679,6 +679,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
@@ -5291,7 +5291,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
@@ -5320,13 +5320,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;
}
@@ -48,10 +48,6 @@
#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_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. */
@@ -1219,10 +1215,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
@@ -1230,6 +1223,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
@@ -601,7 +601,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 *);