From patchwork Tue Oct 29 16:57:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 99784 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BF4D43857BBA for ; Tue, 29 Oct 2024 16:58:34 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 126D93858C52 for ; Tue, 29 Oct 2024 16:57:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 126D93858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 126D93858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730221081; cv=none; b=BbTTJxfZsPvlNAWbYgLc5+58I+edixE7WYciWdYesobiH6gerlBTNQKS5QcMV8p3HYqbMd0pAiOCPOgD2L9XX/7wnaAAhb1Go+Hy46PZ+L6wsA1i9CfxfJO1JSXFDLg7cYJDZkc9G6uk7L76qtGmcypQevnLEm2C1OCV6ccV+TY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1730221081; c=relaxed/simple; bh=gb26wrLKVi2eY28XnxI+uJhNaX1RLjd2O4z46xC0RBw=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=mDny8w8PXWqAy4GTobsn26JQ7wiWOgJU0ynrhEigF6qI9l198D64wH25lWsSkzh7TxGCUEegMRrqmpHCF4jlMl/8+QvtuamCPzGDnnODC1ywmP+7IBPZuk4VEwDi7NAP8Ujyxxbmsw0x11bHFnP1FGSu7AUw/H8PZYcmSUN0vgk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id E66AB1FDF3; Tue, 29 Oct 2024 16:57:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730221071; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p1uYHpDpZGn7aqrUzzlaQyTw75olrQksolZ8xi3EBiU=; b=Wx4mkZNe/1BH7CVQOQYdEhnHmx8/xvEwbJXLysilKvELNCccRBOjVebuqtvRd5pVHi2QYt fd/q5dRigZmfEp5i9kM8Fe+GXqTHrANd/12FrgnNi7aaSEMeC0OM7uR9xEnDZ3qNCvRrP+ UncHYy80ZYYtkw3zbq6bbSKgUJpiRsc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730221071; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p1uYHpDpZGn7aqrUzzlaQyTw75olrQksolZ8xi3EBiU=; b=FHK+Un8TcLpta1OzNkL2bPDEFIakcnguryNQA7y4WfpuizMbt7Tu/3WJ4EymkTZ6pqpne3 sPBobQG5LGj/oxDg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=XgRlWsWZ; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=hrRTwIfx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1730221070; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p1uYHpDpZGn7aqrUzzlaQyTw75olrQksolZ8xi3EBiU=; b=XgRlWsWZeAmXSYefivQ8DU7vNTwpY4EuzhNSHxvm2WsZTEC/xsktGAjSfYGPHzmrG5HyHH sSyiI2gIyuyjMDUl+vI+XetrkkwqEQmGesU8awkMUIsBWy7AagHIdx6zZ568R3Ydzy/VDg btZwiEOjdPSwFPpW1cUDinsa/5ld8ug= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1730221070; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p1uYHpDpZGn7aqrUzzlaQyTw75olrQksolZ8xi3EBiU=; b=hrRTwIfxANmQ16QbxL4Du2BdaeBI4KO2pYuAGJQtU13iHmezXt5XcGt9cUqeBukKNBj96+ 6TFmRnrRCPeIOvAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C9D9513AD1; Tue, 29 Oct 2024 16:57:50 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SC0PMA4UIWdfLgAAD6G6ig (envelope-from ); Tue, 29 Oct 2024 16:57:50 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/3] [gdb/symtab] Fix parent map dump Date: Tue, 29 Oct 2024 17:57:38 +0100 Message-Id: <20241029165738.6105-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241029165738.6105-1-tdevries@suse.de> References: <20241029165738.6105-1-tdevries@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: E66AB1FDF3 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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~patchwork=sourceware.org@sourceware.org Before the fix for PR symtab/32225, the parent map dump showed a mapping from section offsets to cooked index entries: ... 0x0000000000000035 0x3ba9560 (0x34: sp1::A) ... but now that's no longer the case: ... 0x00000000406f5405 0x410a04d0 (0x34: sp1::A) ... Fix this by extending the annotation somewhat, such that we get: ... map start: 0x0000000012c52405 0x135fd550 (section: .debug_info, offset: 0x35) -> (0x34: sp1::A) ... Tested on x86_64-linux. Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32225 --- gdb/addrmap.c | 3 ++- gdb/addrmap.h | 1 + gdb/dwarf2/parent-map.h | 4 ++-- gdb/dwarf2/read.c | 40 +++++++++++++++++++++++++++++++--------- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/gdb/addrmap.c b/gdb/addrmap.c index 696a7dc1b2a..bd5601b063e 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -356,6 +356,7 @@ addrmap_mutable::~addrmap_mutable () void addrmap_dump (struct addrmap *map, struct ui_file *outfile, void *payload, gdb::function_view annotate_value) { /* True if the previously printed addrmap entry was for PAYLOAD. @@ -381,7 +382,7 @@ addrmap_dump (struct addrmap *map, struct ui_file *outfile, void *payload, core_addr_to_string (start_addr), addr_str); if (annotate_value != nullptr) - annotate_value (outfile, obj); + annotate_value (outfile, start_addr, obj); gdb_printf (outfile, "\n"); } diff --git a/gdb/addrmap.h b/gdb/addrmap.h index 85d46452c2a..6e2111e9b52 100644 --- a/gdb/addrmap.h +++ b/gdb/addrmap.h @@ -225,6 +225,7 @@ struct addrmap_mutable final : public addrmap void addrmap_dump (struct addrmap *map, struct ui_file *outfile, void *payload, gdb::function_view annotate_value = nullptr); diff --git a/gdb/dwarf2/parent-map.h b/gdb/dwarf2/parent-map.h index a9ea34ec08c..91a8b8c2c88 100644 --- a/gdb/dwarf2/parent-map.h +++ b/gdb/dwarf2/parent-map.h @@ -102,7 +102,7 @@ class parent_map } /* Dump a human-readable form of this map. */ - void dump () const; + void dump (dwarf2_per_bfd *per_bfd) const; private: @@ -142,7 +142,7 @@ class parent_map_map } /* Dump a human-readable form of this collection of parent_maps. */ - void dump () const; + void dump (dwarf2_per_bfd *per_bfd) const; private: diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e9f97380d56..18954a6ab7e 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -4463,19 +4463,41 @@ cooked_index_storage::eq_cutu_reader (const void *a, const void *b) /* Dump MAP as parent_map. */ static void -dump_parent_map (const struct addrmap *map) +dump_parent_map (dwarf2_per_bfd *per_bfd, const struct addrmap *map) { auto_obstack temp_storage; auto annotate_cooked_index_entry - = [&] (struct ui_file *outfile, const void *value) + = [&] (struct ui_file *outfile, CORE_ADDR start_addr, const void *value) { const cooked_index_entry *parent_entry = (const cooked_index_entry *)value; + + gdb_printf (outfile, "\n\t"); + + bool found = false; + for (auto sections : {per_bfd->infos, per_bfd->types}) + for (auto section : sections) + if ((CORE_ADDR)section.buffer <= start_addr + && start_addr < (CORE_ADDR) (section.buffer + section.size)) + { + gdb_printf (outfile, "(section: %s, offset: 0x%" PRIx64 ")", + section.get_name (), + start_addr - (CORE_ADDR)section.buffer); + found = true; + break; + } + + if (!found) + gdb_printf (outfile, "()"); + if (parent_entry == nullptr) - return; + { + gdb_printf (outfile, " -> ()"); + return; + } - gdb_printf (outfile, " (0x%" PRIx64 ": %s)", + gdb_printf (outfile, " -> (0x%" PRIx64 ": %s)", to_underlying (parent_entry->die_offset), parent_entry->full_name (&temp_storage, false)); }; @@ -4487,20 +4509,20 @@ dump_parent_map (const struct addrmap *map) /* See parent-map.h. */ void -parent_map::dump () const +parent_map::dump (dwarf2_per_bfd *per_bfd) const { - dump_parent_map (&m_map); + dump_parent_map (per_bfd, &m_map); } /* See parent-map.h. */ void -parent_map_map::dump () const +parent_map_map::dump (dwarf2_per_bfd *per_bfd) const { for (const auto &iter : m_maps) { gdb_printf (gdb_stdlog, "map start:\n"); - dump_parent_map (iter); + dump_parent_map (per_bfd, iter); } } @@ -4901,7 +4923,7 @@ class cooked_index_debug_info : public cooked_index_worker if (dwarf_read_debug > 1) { dwarf_read_debug_printf_v ("Final m_all_parents_map:"); - m_all_parents_map.dump (); + m_all_parents_map.dump (m_per_objfile->per_bfd); } }