From patchwork Fri Dec 8 23:52:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 24835 Received: (qmail 36453 invoked by alias); 8 Dec 2017 23:52:44 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 36430 invoked by uid 89); 8 Dec 2017 23:52:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Dec 2017 23:52:42 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B960477; Fri, 8 Dec 2017 23:52:41 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 910B517102; Fri, 8 Dec 2017 23:52:38 +0000 (UTC) Subject: Re: [PATCH v3 3/5] Code cleanup: dwarf2_initialize_objfile return value To: Jan Kratochvil , gdb-patches@sourceware.org References: <149790572259.20186.14601775821404892582.stgit@host1.jankratochvil.net> <149790575186.20186.4091613230201630619.stgit@host1.jankratochvil.net> Cc: Victor Leschuk From: Pedro Alves Message-ID: <83d5d4a6-a137-b680-1af0-33b895bd817d@redhat.com> Date: Fri, 8 Dec 2017 23:52:36 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <149790575186.20186.4091613230201630619.stgit@host1.jankratochvil.net> 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 > > * 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 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 * 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(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0f26785..b6f3714 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,4 +1,14 @@ 2017-12-08 Jan Kratochvil + + * 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 Pedro Alves * contrib/gdb-add-index.sh (index): Rename to ... diff --git a/gdb/defs.h b/gdb/defs.h index f76293f..a873a55 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -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 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; } diff --git a/gdb/elfread.c b/gdb/elfread.c index b8881d9..904696f 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -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 diff --git a/gdb/symfile.h b/gdb/symfile.h index fa38abf..194dccf 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -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 *);