From patchwork Sat Feb 8 15:27:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 37766 Received: (qmail 69540 invoked by alias); 8 Feb 2020 15:28:06 -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 69487 invoked by uid 89); 8 Feb 2020 15:28:06 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=sk:dwarf_r, fetching X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.119) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 08 Feb 2020 15:28:04 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway34.websitewelcome.com (Postfix) with ESMTP id DA6E9DEED80 for ; Sat, 8 Feb 2020 09:28:01 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id 0S1ZjRpd7RP4z0S1ZjuLrw; Sat, 08 Feb 2020 09:28:01 -0600 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=ywFprqaqBueeOsjM8YJGYg2YmLgKlKn7fN/vlGWhoSI=; b=eBiHRNyqg0vS3SVXcY2PW9FFV1 TpXNxWsfR5TkPIVvYr3Jgsc2tUTRFcVX3gRaKKCPgn6roUPxTAcxKzM2lOn+Hm8ilTTb8it0pVeU4 CekbNiVK6hCuRh2M50U3ln0HA; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:38112 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1j0S1Z-001WwE-LP; Sat, 08 Feb 2020 08:28:01 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 7/8] Remove the objfile backlink from comp_unit Date: Sat, 8 Feb 2020 08:27:57 -0700 Message-Id: <20200208152758.29385-8-tom@tromey.com> In-Reply-To: <20200208152758.29385-1-tom@tromey.com> References: <20200208152758.29385-1-tom@tromey.com> This removes the objfile backlink from comp_unit. The only remaining uses involved fetching the text offset from the objfile. However, this is already convenient computed at all the sites that call execute_cfa_program, and so it can simply be passed in. gdb/ChangeLog 2020-02-08 Tom Tromey * dwarf2/frame.c (struct comp_unit) : Remove. (execute_cfa_program): Add text_offset parameter. (execute_cfa_program_test, dwarf2_fetch_cfa_info) (dwarf2_frame_cache): Update. (dwarf2_build_frame_info): Don't set "objfile" member. Change-Id: I81b1c82d514dad83b3d00053756a07ef54b19796 --- gdb/ChangeLog | 8 ++++++++ gdb/dwarf2/frame.c | 25 +++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c index d4f6165b75c..2c35016e2d9 100644 --- a/gdb/dwarf2/frame.c +++ b/gdb/dwarf2/frame.c @@ -139,8 +139,6 @@ struct comp_unit /* Keep the bfd convenient. */ bfd *abfd = nullptr; - struct objfile *objfile = nullptr; - /* Pointer to the .debug_frame section loaded into memory. */ const gdb_byte *dwarf_frame_buffer = nullptr; @@ -349,7 +347,8 @@ Not implemented: computing unwound register using explicit value operator")); static const gdb_byte * execute_cfa_program (struct dwarf2_fde *fde, const gdb_byte *insn_ptr, const gdb_byte *insn_end, struct gdbarch *gdbarch, - CORE_ADDR pc, struct dwarf2_frame_state *fs) + CORE_ADDR pc, struct dwarf2_frame_state *fs, + CORE_ADDR text_offset) { int eh_frame_p = fde->eh_frame_p; unsigned int bytes_read; @@ -386,8 +385,8 @@ execute_cfa_program (struct dwarf2_fde *fde, const gdb_byte *insn_ptr, fs->pc = read_encoded_value (fde->cie->unit, fde->cie->encoding, fde->cie->ptr_size, insn_ptr, &bytes_read, fde->initial_location); - /* Apply the objfile offset for relocatable objects. */ - fs->pc += fde->cie->unit->objfile->text_section_offset (); + /* Apply the text offset for relocatable objects. */ + fs->pc += text_offset; insn_ptr += bytes_read; break; @@ -646,7 +645,7 @@ execute_cfa_program_test (struct gdbarch *gdbarch) const gdb_byte *insn_end = insns + sizeof (insns); const gdb_byte *out = execute_cfa_program (&fde, insns, insn_end, gdbarch, - 0, &fs); + 0, &fs, 0); SELF_CHECK (out == insn_end); SELF_CHECK (fs.pc == 0); @@ -894,13 +893,14 @@ dwarf2_fetch_cfa_info (struct gdbarch *gdbarch, CORE_ADDR pc, /* First decode all the insns in the CIE. */ execute_cfa_program (fde, fde->cie->initial_instructions, - fde->cie->end, gdbarch, pc, &fs); + fde->cie->end, gdbarch, pc, &fs, text_offset); /* Save the initialized register set. */ fs.initial = fs.regs; /* Then decode the insns in the FDE up to our target PC. */ - execute_cfa_program (fde, fde->instructions, fde->end, gdbarch, pc, &fs); + execute_cfa_program (fde, fde->instructions, fde->end, gdbarch, pc, &fs, + text_offset); /* Calculate the CFA. */ switch (fs.regs.cfa_how) @@ -1022,7 +1022,8 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache) /* First decode all the insns in the CIE. */ execute_cfa_program (fde, fde->cie->initial_instructions, fde->cie->end, gdbarch, - get_frame_address_in_block (this_frame), &fs); + get_frame_address_in_block (this_frame), &fs, + cache->text_offset); /* Save the initialized register set. */ fs.initial = fs.regs; @@ -1037,7 +1038,7 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache) { /* Decode the insns in the FDE up to the entry PC. */ instr = execute_cfa_program (fde, fde->instructions, fde->end, gdbarch, - entry_pc, &fs); + entry_pc, &fs, cache->text_offset); if (fs.regs.cfa_how == CFA_REG_OFFSET && (dwarf_reg_to_regnum (gdbarch, fs.regs.cfa_reg) @@ -1052,7 +1053,8 @@ dwarf2_frame_cache (struct frame_info *this_frame, void **this_cache) /* Then decode the insns in the FDE up to our target PC. */ execute_cfa_program (fde, instr, fde->end, gdbarch, - get_frame_address_in_block (this_frame), &fs); + get_frame_address_in_block (this_frame), &fs, + cache->text_offset); try { @@ -2135,7 +2137,6 @@ dwarf2_build_frame_info (struct objfile *objfile) /* Build a minimal decoding of the DWARF2 compilation unit. */ unit = new comp_unit; unit->abfd = objfile->obfd; - unit->objfile = objfile; if (objfile->separate_debug_objfile_backlink == NULL) {