From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id QaYDG13dvWgUlzAAWB0awg (envelope-from ) for ; Sun, 07 Sep 2025 15:30:37 -0400 Authentication-Results: simark.ca; dkim=fail reason="signature verification failed" (768-bit key; unprotected) header.d=tromey.com header.i=@tromey.com header.a=rsa-sha256 header.s=default header.b=NCq9OQpn; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 58EDB1E0BA; Sun, 07 Sep 2025 15:30:37 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.5 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED autolearn=no autolearn_force=no version=4.0.1 Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 8084F1E047 for ; Sun, 07 Sep 2025 15:30:36 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 38A5A3858CD1 for ; Sun, 7 Sep 2025 19:30:36 +0000 (GMT) Received: from omta040.useast.a.cloudfilter.net (omta040.useast.a.cloudfilter.net [44.202.169.39]) by sourceware.org (Postfix) with ESMTPS id 31F263858D39 for ; Sun, 7 Sep 2025 19:29:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 31F263858D39 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 31F263858D39 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.39 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757273360; cv=none; b=oR3rqMPGYDcs8Y/jjxXZM3reuMEsiKCBRsDhKbsjpvC4DU93e+BjiNoRX4If9A2Yz5kY4R4pHMD10186oOe+5R/AEvhEYpnSRmiSHS9bhyb/mmTegbiBYVU/GDgUlyxNCtm9Ut8tYXAjMPPiu9UlRZCwAEkwdASJ0nU0jmi2Bcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757273360; c=relaxed/simple; bh=8OaG3zEcD8BtA1EVSaygUgGM0rfn2Wn22yQRDPrGwoQ=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=hoPgTCCKXJzmMwqC0nL9i7LcY6LYeDL8DUBPH21gMYcGbNpqijv3dqw6uDog0itZpSzGEmpmSW0cobdeXMgdLarE5Uebtkl74exj933SuYpUDZC1vAXIZv041Uhh2+lGat3QzWQyb5tMUjBn9rs33lVqZ6tdVyPjfMideripgPg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5006b.ext.cloudfilter.net ([10.0.29.217]) by cmsmtp with ESMTPS id vK9LuT4bVv724vL4furoek; Sun, 07 Sep 2025 19:29:17 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id vL4eu20kicL7DvL4fuLSw3; Sun, 07 Sep 2025 19:29:17 +0000 X-Authority-Analysis: v=2.4 cv=Xqb6OUF9 c=1 sm=1 tr=0 ts=68bddd0d a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=yJojWOMRYYMA:10 a=ItBw4LHWJt0A:10 a=Jk8xT9qYS52KY0fSVZMA:9 a=QEXdDO2ut3YA:10 a=VS4QxaUSPT0UtbFnIvSC:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=ls78VkTERj1BVW1mwMRVxyK31chBxMnj86E2WqBD/Ww=; b=NCq9OQpnl3tFhJgK+GEefJEPfy l0lWpZIldw4K/xWCWUUeIVdRe+5+TK9O/HBrWfdr8Cj4A3l64xgOlhIHzvm9cfGGVE6L40Rb8Ln4L jmUhCOgwJYN6tF92zBRcSgdHb; Received: from 97-122-110-68.hlrn.qwest.net ([97.122.110.68]:43620 helo=[192.168.0.17]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.1) (envelope-from ) id 1uvL4e-00000003nLh-1fDy; Sun, 07 Sep 2025 13:29:16 -0600 From: Tom Tromey Date: Sun, 07 Sep 2025 13:29:19 -0600 Subject: [PATCH 7/7] Change dwarf_record_line_1 to be a method MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250907-breakpoint-cu-expand-v1-7-dd2beef9d475@tromey.com> References: <20250907-breakpoint-cu-expand-v1-0-dd2beef9d475@tromey.com> In-Reply-To: <20250907-breakpoint-cu-expand-v1-0-dd2beef9d475@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey X-Mailer: b4 0.14.2 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.110.68 X-Source-L: No X-Exim-ID: 1uvL4e-00000003nLh-1fDy X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-110-68.hlrn.qwest.net ([192.168.0.17]) [97.122.110.68]:43620 X-Source-Auth: tom+tromey.com X-Email-Count: 8 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfIanK0UJHxAOKs4qrl55oKtKYdSTqyVn1UYtIcXXQ+a+9uLXGM/I8qYdjKdqsp7mGEHUypv5hYCMw+rguTN/c2aNQ1Lh19SyuNl/MxvvONJf6ZL49ggv +/7CFynrGyzelJmBcg6uvJONfmJYYfn3FTNN1qQVEGXCKoAAePA0eCEoeBQQRHP8IXRweCC3lUNGaPBTxiamGwcB8m6OxQPbVx0= X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~public-inbox=simark.ca@sourceware.org This changes dwarf_record_line_1 to be a method of lnp_state_machine, simplifying it a bit. --- gdb/dwarf2/line-program.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/gdb/dwarf2/line-program.c b/gdb/dwarf2/line-program.c index b6007e368344216af3e09d2651d9483b7d2940e6..48ae4befd5409f11d73a01cbf565b735442ce886 100644 --- a/gdb/dwarf2/line-program.c +++ b/gdb/dwarf2/line-program.c @@ -152,6 +152,7 @@ class lnp_state_machine bool record_line_p (); void finish_line (); + void record_line_1 (unsigned int line, linetable_entry_flags flags); struct dwarf2_cu *m_cu; @@ -315,24 +316,22 @@ lnp_state_machine::record_line_p () /* Use the CU's builder to record line number LINE beginning at address ADDRESS in the line table of subfile SUBFILE. */ -static void -dwarf_record_line_1 (struct gdbarch *gdbarch, struct subfile *subfile, - unsigned int line, unrelocated_addr address, - linetable_entry_flags flags, - struct dwarf2_cu *cu) +void +lnp_state_machine::record_line_1 (unsigned int line, + linetable_entry_flags flags) { - unrelocated_addr addr - = unrelocated_addr (gdbarch_addr_bits_remove (gdbarch, - (CORE_ADDR) address)); - - if (cu != nullptr) + if (m_currently_recording_lines) { + unrelocated_addr addr + = unrelocated_addr (gdbarch_addr_bits_remove (m_gdbarch, + (CORE_ADDR) m_address)); + if (dwarf_line_debug) gdb_printf (gdb_stdlog, "Recording line %u, file %s, address %s\n", - line, lbasename (subfile->name.c_str ()), - paddress (gdbarch, (CORE_ADDR) address)); + m_line, lbasename (m_last_subfile->name.c_str ()), + paddress (m_gdbarch, (CORE_ADDR) addr)); - cu->get_builder ()->record_line (subfile, line, addr, flags); + m_builder->record_line (m_last_subfile, line, addr, flags); } } @@ -354,8 +353,7 @@ lnp_state_machine::finish_line () paddress (m_gdbarch, (CORE_ADDR) m_address)); } - dwarf_record_line_1 (m_gdbarch, m_last_subfile, 0, m_address, LEF_IS_STMT, - m_currently_recording_lines ? m_cu : nullptr); + record_line_1 (0, LEF_IS_STMT); } void @@ -419,12 +417,8 @@ lnp_state_machine::record_line (bool end_sequence) if (record_line_p ()) { - dwarf_record_line_1 (m_gdbarch, - m_builder->get_current_subfile (), - m_line, m_address, lte_flags, - m_currently_recording_lines ? m_cu : nullptr); - m_last_subfile = m_builder->get_current_subfile (); + record_line_1 (m_line, lte_flags); m_last_line = m_line; } } -- 2.49.0