From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.47.65]) by sourceware.org (Postfix) with ESMTPS id 52F3B385E017 for ; Sun, 22 Mar 2020 18:45:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 52F3B385E017 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 9F0494130 for ; Sun, 22 Mar 2020 13:45:25 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id G5bBjE0f1Sl8qG5bBjm0wg; Sun, 22 Mar 2020 13:45:25 -0500 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: 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=aeNGUxZsZ75KpoALJ2CUGiqRHG4rjC0bSBeT0lYB4Eg=; b=WMqypHwlQWdmapJgrrEtrbL5Fz /CS+VFTUw9rI6w0Nftzzi44ElUjg8lkJNe+QJzbFyvpPFsupyuWA3qGJyUjA4iV+igStXgWzvWE0r 9NMWpuFv94uRvdPPs2SEJMhwe; Received: from 97-118-117-21.hlrn.qwest.net ([97.118.117.21]:48304 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1jG5bB-000LNS-Dn; Sun, 22 Mar 2020 12:45:25 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 01/22] Introduce dwarf2/dwz.h Date: Sun, 22 Mar 2020 12:45:02 -0600 Message-Id: <20200322184523.28959-2-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200322184523.28959-1-tom@tromey.com> References: <20200322184523.28959-1-tom@tromey.com> 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.118.117.21 X-Source-L: No X-Exim-ID: 1jG5bB-000LNS-Dn X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-117-21.hlrn.qwest.net (bapiya.Home) [97.118.117.21]:48304 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-22.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, JMQ_SPF_NEUTRAL, KAM_SHORT, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS, URIBL_CSS_A 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, 22 Mar 2020 18:45:28 -0000 This moves "struct dwz_file" to a new header file, dwarf2/dwz.h. gdb/ChangeLog 2020-03-22 Tom Tromey * dwarf2/read.h (struct dwz_file): Move to dwz.h. * dwarf2/read.c: Add include. * dwarf2/index-write.c: Add include. * dwarf2/index-cache.c: Add include. * dwarf2/dwz.h: New file. --- gdb/ChangeLog | 8 ++++++ gdb/dwarf2/dwz.h | 58 ++++++++++++++++++++++++++++++++++++++++ gdb/dwarf2/index-cache.c | 1 + gdb/dwarf2/index-write.c | 1 + gdb/dwarf2/read.c | 1 + gdb/dwarf2/read.h | 31 --------------------- 6 files changed, 69 insertions(+), 31 deletions(-) create mode 100644 gdb/dwarf2/dwz.h diff --git a/gdb/dwarf2/dwz.h b/gdb/dwarf2/dwz.h new file mode 100644 index 00000000000..94b84ebf3d9 --- /dev/null +++ b/gdb/dwarf2/dwz.h @@ -0,0 +1,58 @@ +/* DWARF DWZ handling for GDB. + + Copyright (C) 2003-2020 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 GDB_DWARF2_DWZ_H +#define GDB_DWARF2_DWZ_H + +#include "gdb_bfd.h" +#include "dwarf2/index-cache.h" +#include "dwarf2/section.h" + +/* This represents a '.dwz' file. */ + +struct dwz_file +{ + dwz_file (gdb_bfd_ref_ptr &&bfd) + : dwz_bfd (std::move (bfd)) + { + } + + const char *filename () const + { + return bfd_get_filename (this->dwz_bfd.get ()); + } + + /* A dwz file can only contain a few sections. */ + struct dwarf2_section_info abbrev {}; + struct dwarf2_section_info info {}; + struct dwarf2_section_info str {}; + struct dwarf2_section_info line {}; + struct dwarf2_section_info macro {}; + struct dwarf2_section_info gdb_index {}; + struct dwarf2_section_info debug_names {}; + + /* The dwz's BFD. */ + gdb_bfd_ref_ptr dwz_bfd; + + /* If we loaded the index from an external file, this contains the + resources associated to the open file, memory mapping, etc. */ + std::unique_ptr index_cache_res; +}; + +#endif /* GDB_DWARF2_DWZ_H */ diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c index 7b4d9975905..62fbe2a0b4d 100644 --- a/gdb/dwarf2/index-cache.c +++ b/gdb/dwarf2/index-cache.c @@ -27,6 +27,7 @@ #include "gdbsupport/pathstuff.h" #include "dwarf2/index-write.h" #include "dwarf2/read.h" +#include "dwarf2/dwz.h" #include "objfiles.h" #include "gdbsupport/selftest.h" #include diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 4b711d0d29a..8c933dc63b7 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -32,6 +32,7 @@ #include "dwarf2/index-common.h" #include "dwarf2.h" #include "dwarf2/read.h" +#include "dwarf2/dwz.h" #include "gdb/gdb-index.h" #include "gdbcmd.h" #include "objfiles.h" diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 0e879e08a0c..57ef2428c02 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -37,6 +37,7 @@ #include "dwarf2/index-common.h" #include "dwarf2/leb.h" #include "dwarf2/line-header.h" +#include "dwarf2/dwz.h" #include "bfd.h" #include "elf-bfd.h" #include "symtab.h" diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index f0e3d6bb723..c5a8ecf8a6a 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -491,37 +491,6 @@ struct signatured_type struct dwo_unit *dwo_unit; }; -/* This represents a '.dwz' file. */ - -struct dwz_file -{ - dwz_file (gdb_bfd_ref_ptr &&bfd) - : dwz_bfd (std::move (bfd)) - { - } - - const char *filename () const - { - return bfd_get_filename (this->dwz_bfd.get ()); - } - - /* A dwz file can only contain a few sections. */ - struct dwarf2_section_info abbrev {}; - struct dwarf2_section_info info {}; - struct dwarf2_section_info str {}; - struct dwarf2_section_info line {}; - struct dwarf2_section_info macro {}; - struct dwarf2_section_info gdb_index {}; - struct dwarf2_section_info debug_names {}; - - /* The dwz's BFD. */ - gdb_bfd_ref_ptr dwz_bfd; - - /* If we loaded the index from an external file, this contains the - resources associated to the open file, memory mapping, etc. */ - std::unique_ptr index_cache_res; -}; - /* Open the separate '.dwz' debug file, if needed. Return NULL if there is no .gnu_debugaltlink section in the file. Error if there is such a section but the file cannot be found. */ -- 2.17.2