From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 73497 invoked by alias); 9 Feb 2020 23:56:11 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 73410 invoked by uid 89); 9 Feb 2020 23:56:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-29.4 required=5.0 tests=AWL,BAYES_00,ENV_AND_HDR_SPF_MATCH,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_PASS,USER_IN_DEF_SPF_WL autolearn=ham version=3.3.1 spammy=pc, PC, unwound, H*c:alternative X-HELO: mail-ot1-f67.google.com Received: from mail-ot1-f67.google.com (HELO mail-ot1-f67.google.com) (209.85.210.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 09 Feb 2020 23:56:08 +0000 Received: by mail-ot1-f67.google.com with SMTP id j20so4661714otq.3 for ; Sun, 09 Feb 2020 15:56:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=FAW+MG7sLrvFYGkehbK2mMLnBlwxicK3KUUmhjfiK7I=; b=K0Qai25QHIPM6upgY202ob+uYv1GnJJowdo5r+n4tL4jpcpgxfnF1T0E8W4FbcQvz4 54ioKKaaEK/jTvGs7WkU3SyfXalW/RzzX+Sm07IbLH/6tGgkfc0jpEPK8rt2XLla2HT5 fOsghAZfDRo3uWKgy81jKArunG9OVTmdnKc7VeGj582xFGlv2RMZilZZMFK8Sv47gpyb whRlSNugGapXv7Y/uR6amE16oBmTCIMQWWikPFsCbMxzXvv3KPhTvu9yLyTqGacvVwZU bnMNHVxU1R4HPyy10kD17OYCYbw3zhbpbfsQlRXVFtcoIc2aJ6yQFNSjzs8NdEMEQOYf 4wdQ== MIME-Version: 1.0 References: <20200208152758.29385-1-tom@tromey.com> <20200208152758.29385-8-tom@tromey.com> In-Reply-To: <20200208152758.29385-8-tom@tromey.com> From: "Christian Biesinger via gdb-patches" Reply-To: Christian Biesinger Date: Sun, 09 Feb 2020 23:56:00 -0000 Message-ID: Subject: Re: [PATCH 7/8] Remove the objfile backlink from comp_unit To: Tom Tromey Cc: gdb-patches Content-Type: text/plain; charset="UTF-8" X-IsSubscribed: yes X-SW-Source: 2020-02/txt/msg00266.txt.bz2 On Sat, Feb 8, 2020, 10:28 Tom Tromey wrote: > 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 > convenient -> conveniently, I think? 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) > { > -- > 2.17.2 > >