From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.197.22]) by sourceware.org (Postfix) with ESMTPS id 4A35C385E016 for ; Sun, 22 Mar 2020 18:45:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4A35C385E016 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 cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 3761C400C6C5A for ; Sun, 22 Mar 2020 13:01:39 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id G5bBjQ0yjVQh0G5bBjeUTf; 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=m9Bm7cPNvEvXdi0L2wYhPTkEuT6Oe6/j7kg2ojvpcm4=; b=od5vJAnCB6hEKENV2PLG3jZDOi wfltwL3IMnziUprR3Ky9BiopG2K9ROPmA90NHn7Iu45g/b9GoBuA8WyHpEMpss//11erxa6uJrSGQ F1p0PJk5JPvn+jcITDmp2l+Za; 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-Kh; Sun, 22 Mar 2020 12:45:25 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 02/22] Add dwz.c and dwz_file::read_string Date: Sun, 22 Mar 2020 12:45:03 -0600 Message-Id: <20200322184523.28959-3-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-Kh 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: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-22.5 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 changes read_indirect_string_from_dwz to be a method on the dwz_file, and adds a new dwarf2/dwz.c file. gdb/ChangeLog 2020-03-22 Tom Tromey * dwarf2/read.c (read_attribute_value): Update. (read_indirect_string_from_dwz): Move to dwz.c; change into method. (dwarf_decode_macro_bytes): Update. * dwarf2/dwz.h (struct dwz_file) : Declare method. * dwarf2/dwz.c: New file. * Makefile.in (COMMON_SFILES): Add dwz.c. --- gdb/ChangeLog | 10 ++++++++++ gdb/Makefile.in | 1 + gdb/dwarf2/dwz.c | 40 ++++++++++++++++++++++++++++++++++++++++ gdb/dwarf2/dwz.h | 7 +++++++ gdb/dwarf2/read.c | 34 ++-------------------------------- 5 files changed, 60 insertions(+), 32 deletions(-) create mode 100644 gdb/dwarf2/dwz.c diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 0c331af4bff..c9450ce7b52 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1003,6 +1003,7 @@ COMMON_SFILES = \ dwarf2/abbrev.c \ dwarf2/attribute.c \ dwarf2/comp-unit.c \ + dwarf2/dwz.c \ dwarf2/expr.c \ dwarf2/frame-tailcall.c \ dwarf2/frame.c \ diff --git a/gdb/dwarf2/dwz.c b/gdb/dwarf2/dwz.c new file mode 100644 index 00000000000..a7143738194 --- /dev/null +++ b/gdb/dwarf2/dwz.c @@ -0,0 +1,40 @@ +/* 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 . */ + +#include "defs.h" +#include "dwarf2/dwz.h" + +const char * +dwz_file::read_string (struct objfile *objfile, LONGEST str_offset) +{ + str.read (objfile); + + if (str.buffer == NULL) + error (_("DW_FORM_GNU_strp_alt used without .debug_str " + "section [in module %s]"), + bfd_get_filename (dwz_bfd.get ())); + if (str_offset >= str.size) + error (_("DW_FORM_GNU_strp_alt pointing outside of " + ".debug_str section [in module %s]"), + bfd_get_filename (dwz_bfd.get ())); + gdb_assert (HOST_CHAR_BIT == 8); + if (str.buffer[str_offset] == '\0') + return NULL; + return (const char *) (str.buffer + str_offset); +} diff --git a/gdb/dwarf2/dwz.h b/gdb/dwarf2/dwz.h index 94b84ebf3d9..54e60612a3f 100644 --- a/gdb/dwarf2/dwz.h +++ b/gdb/dwarf2/dwz.h @@ -53,6 +53,13 @@ struct dwz_file /* 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; + + /* Read a string at offset STR_OFFSET in the .debug_str section from + this dwz file. Throw an error if the offset is too large. If + the string consists of a single NUL byte, return NULL; otherwise + return a pointer to the string. */ + + const char *read_string (struct objfile *objfile, LONGEST str_offset); }; #endif /* GDB_DWARF2_DWZ_H */ diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 57ef2428c02..23b3fab1be5 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1259,9 +1259,6 @@ static const char *read_indirect_string_at_offset (struct dwarf2_per_objfile *dwarf2_per_objfile, bfd *abfd, LONGEST str_offset); -static const char *read_indirect_string_from_dwz - (struct objfile *objfile, struct dwz_file *, LONGEST); - static CORE_ADDR read_addr_index_from_leb128 (struct dwarf2_cu *, const gdb_byte *, unsigned int *); @@ -18585,8 +18582,7 @@ read_attribute_value (const struct die_reader_specs *reader, LONGEST str_offset = cu_header->read_offset (abfd, info_ptr, &bytes_read); - DW_STRING (attr) = read_indirect_string_from_dwz (objfile, - dwz, str_offset); + DW_STRING (attr) = dwz->read_string (objfile, str_offset); DW_STRING_IS_CANONICAL (attr) = 0; info_ptr += bytes_read; } @@ -18831,31 +18827,6 @@ read_indirect_line_string_at_offset (struct dwarf2_per_objfile *dwarf2_per_objfi ".debug_line_str"); } -/* Read a string at offset STR_OFFSET in the .debug_str section from - the .dwz file DWZ. Throw an error if the offset is too large. If - the string consists of a single NUL byte, return NULL; otherwise - return a pointer to the string. */ - -static const char * -read_indirect_string_from_dwz (struct objfile *objfile, struct dwz_file *dwz, - LONGEST str_offset) -{ - dwz->str.read (objfile); - - if (dwz->str.buffer == NULL) - error (_("DW_FORM_GNU_strp_alt used without .debug_str " - "section [in module %s]"), - bfd_get_filename (dwz->dwz_bfd.get ())); - if (str_offset >= dwz->str.size) - error (_("DW_FORM_GNU_strp_alt pointing outside of " - ".debug_str section [in module %s]"), - bfd_get_filename (dwz->dwz_bfd.get ())); - gdb_assert (HOST_CHAR_BIT == 8); - if (dwz->str.buffer[str_offset] == '\0') - return NULL; - return (const char *) (dwz->str.buffer + str_offset); -} - /* Return pointer to string at .debug_str offset as read from BUF. BUF is assumed to be in a compilation unit described by CU_HEADER. Return *BYTES_READ_PTR count of bytes read from BUF. */ @@ -23584,8 +23555,7 @@ dwarf_decode_macro_bytes (struct dwarf2_cu *cu, struct dwz_file *dwz = dwarf2_get_dwz_file (dwarf2_per_objfile); - body = read_indirect_string_from_dwz (objfile, - dwz, str_offset); + body = dwz->read_string (objfile, str_offset); } else body = read_indirect_string_at_offset (dwarf2_per_objfile, -- 2.17.2