From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.144.94]) by sourceware.org (Postfix) with ESMTPS id 06A4E3842400 for ; Sun, 28 Feb 2021 20:38:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 06A4E3842400 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 7C63E20450 for ; Sun, 28 Feb 2021 14:38:08 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id GSpMlTTiykscSGSpMlawsS; Sun, 28 Feb 2021 14:38:08 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=1PvaXWKJYqlS/M7FRnbrv8eCbbD7IDFEWyZwUReoNr4=; b=XkrBaWa69Ela5CoQSFZg/9l0pZ nyxGo/hXMa+BfflH+cRSBwej6iw+w/efbsdJcwgoHdIEy7tqCYwaEdVaU4FwV2/maVvA7Up7KSZi+ xezdqqLSYTXzW+nKja0nf6X1F; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:36730 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lGSpM-000Xf8-7Y for gdb-patches@sourceware.org; Sun, 28 Feb 2021 13:38:08 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 02/26] Introduce dwarf2/public.h Date: Sun, 28 Feb 2021 13:37:39 -0700 Message-Id: <20210228203803.1693413-3-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210228203803.1693413-1-tom@tromey.com> References: <20210228203803.1693413-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.70.152 X-Source-L: No X-Exim-ID: 1lGSpM-000Xf8-7Y X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:36730 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2021 20:38:10 -0000 This moves some more DWARF code out of symfile.h and into a new header, dwarf2/public.h. This header is intended to describe the public API of the DWARF reader. gdb/ChangeLog 2021-02-28 Tom Tromey * coffread.c: Include dwarf2/public.h. * dwarf2/frame.c: Include dwarf2/public.h. * dwarf2/index-write.h: Include dwarf2/public.h, not symfile.h. * dwarf2/public.h: New file. * dwarf2/read.c: Include dwarf2/public.h. * elfread.c: Include dwarf2/public.h. * machoread.c: Include dwarf2/public.h. * symfile.h (dwarf2_has_info, enum dw_index_kind) (dwarf2_initialize_objfile, dwarf2_build_psymtabs) (dwarf2_build_frame_info): Move to dwarf2/public.h. * xcoffread.c: Include dwarf2/public.h. --- gdb/ChangeLog | 14 ++++++++++++ gdb/coffread.c | 1 + gdb/dwarf2/frame.c | 1 + gdb/dwarf2/index-write.h | 2 +- gdb/dwarf2/public.h | 46 ++++++++++++++++++++++++++++++++++++++++ gdb/dwarf2/read.c | 1 + gdb/elfread.c | 1 + gdb/machoread.c | 1 + gdb/symfile.h | 23 -------------------- gdb/xcoffread.c | 1 + 10 files changed, 67 insertions(+), 24 deletions(-) create mode 100644 gdb/dwarf2/public.h diff --git a/gdb/coffread.c b/gdb/coffread.c index 49a2485d38c..d15ba6593fc 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -36,6 +36,7 @@ #include "target.h" #include "block.h" #include "dictionary.h" +#include "dwarf2/public.h" #include "coff-pe-read.h" diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index 4d62b197d3a..f8612c96f27 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -37,6 +37,7 @@ #include "complaints.h" #include "dwarf2/frame.h" #include "dwarf2/read.h" +#include "dwarf2/public.h" #include "ax.h" #include "dwarf2/loc.h" #include "dwarf2/frame-tailcall.h" diff --git a/gdb/dwarf2/index-write.h b/gdb/dwarf2/index-write.h index 5f6761c91a7..27f1f03cd8b 100644 --- a/gdb/dwarf2/index-write.h +++ b/gdb/dwarf2/index-write.h @@ -20,8 +20,8 @@ #ifndef DWARF_INDEX_WRITE_H #define DWARF_INDEX_WRITE_H -#include "symfile.h" #include "dwarf2/read.h" +#include "dwarf2/public.h" /* Create index files for OBJFILE in the directory DIR. diff --git a/gdb/dwarf2/public.h b/gdb/dwarf2/public.h new file mode 100644 index 00000000000..d0182d4e673 --- /dev/null +++ b/gdb/dwarf2/public.h @@ -0,0 +1,46 @@ +/* Public API for gdb DWARF reader + + Copyright (C) 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 DWARF2_PUBLIC_H +#define DWARF2_PUBLIC_H + +extern int dwarf2_has_info (struct objfile *, + const struct dwarf2_debug_sections *, + bool = false); + +/* 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 *); + +#endif /* DWARF2_PUBLIC_H */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 7ab5d719004..3c25f4efba6 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -41,6 +41,7 @@ #include "dwarf2/macro.h" #include "dwarf2/die.h" #include "dwarf2/stringify.h" +#include "dwarf2/public.h" #include "bfd.h" #include "elf-bfd.h" #include "symtab.h" diff --git a/gdb/elfread.c b/gdb/elfread.c index ce63d6b4b56..8f06c8edc79 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -51,6 +51,7 @@ #include "gdbsupport/gdb_string_view.h" #include "gdbsupport/scoped_fd.h" #include "debuginfod-support.h" +#include "dwarf2/public.h" /* Forward declarations. */ extern const struct sym_fns elf_sym_fns_gdb_index; diff --git a/gdb/machoread.c b/gdb/machoread.c index 0ff61e12f5a..ff50ae54f2a 100644 --- a/gdb/machoread.c +++ b/gdb/machoread.c @@ -32,6 +32,7 @@ #include "gdb_bfd.h" #include #include +#include "dwarf2/public.h" /* If non-zero displays debugging message. */ static unsigned int mach_o_debug_level = 0; diff --git a/gdb/symfile.h b/gdb/symfile.h index b7e2009b669..882f17be027 100644 --- a/gdb/symfile.h +++ b/gdb/symfile.h @@ -599,29 +599,6 @@ struct dwarf2_debug_sections { int sentinel; }; -extern int dwarf2_has_info (struct objfile *, - const struct dwarf2_debug_sections *, - bool = false); - -/* 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 *); - /* From minidebug.c. */ extern gdb_bfd_ref_ptr find_separate_debug_file_in_section (struct objfile *); diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index cd93943a812..6dab4e59234 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -47,6 +47,7 @@ #include "expression.h" #include "complaints.h" #include "psympriv.h" +#include "dwarf2/public.h" #include "gdb-stabs.h" -- 2.26.2