From patchwork Tue May 21 15:44:06 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: 90608 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 9019F3858D3C for ; Tue, 21 May 2024 15:43:37 +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 [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 1C4E73858D1E for ; Tue, 21 May 2024 15:43:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1C4E73858D1E 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 1C4E73858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306186; cv=none; b=SUBgqGiOtO2+aiFfjdRcsJc2B0RKgwQMTxhOzkH1ogHvoS430uYUMF04uQ3pmKDtxGujt6lwwM1NTM4MAcAobEHDTOqx6xm3rjVX+46YlnP5BL6cQ5osOWpvpM2cIZvXrleRqLUBEe1tec+T712mqzys9oAmK3GHyDnjcWmHlAY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716306186; c=relaxed/simple; bh=cRQorUsf4nSxBFLl6kL0RGWeXe7MIwEQt3eeK+IUOws=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=GX8qb2wG3lYthPT0CrkzQiknpDBNgmVIccreFa31AQM4i1S0UyRFRa3b8cjWD90OaviuZlh6UCSMjbpcWHIBIM3551WPf2KOsVArvulRr4lgFMNfuDXAkuKzXAWMrdTNQEoF+zkTrlzO8shh2QiBvjJIqaXovfmh0cNnWIXrN9c= 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 2E5515C290 for ; Tue, 21 May 2024 15:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o94An8Kfab0vcSfUAoIj0OKYaTCwuiu7j3bKSwFA6fc=; b=uviOkfJzQoOmVpMStkhYvqFsOTkokB0BkmgSb67VO1QhhB/XqaEPXAQ0eSsdNNrBAInR0B J/qRf1mciHwuZ/nJZ6sExom882IvooY0bCG/cm53NMvLb8iassvTa1gKGaIa+qFB2i+/iL ZWjpv0h+5Z457QXhfWqRXykD+xAfYmY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o94An8Kfab0vcSfUAoIj0OKYaTCwuiu7j3bKSwFA6fc=; b=JDSZKIQvZ9wUWR24V/e8ZRhGCBwcAMWpGN6NR9NN9ibbVlP0mB6xk2U7Y/vW1fpKB+Uy4f CoaY02YZKWiVsZDA== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=uviOkfJz; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=JDSZKIQv DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o94An8Kfab0vcSfUAoIj0OKYaTCwuiu7j3bKSwFA6fc=; b=uviOkfJzQoOmVpMStkhYvqFsOTkokB0BkmgSb67VO1QhhB/XqaEPXAQ0eSsdNNrBAInR0B J/qRf1mciHwuZ/nJZ6sExom882IvooY0bCG/cm53NMvLb8iassvTa1gKGaIa+qFB2i+/iL ZWjpv0h+5Z457QXhfWqRXykD+xAfYmY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1716306183; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o94An8Kfab0vcSfUAoIj0OKYaTCwuiu7j3bKSwFA6fc=; b=JDSZKIQvZ9wUWR24V/e8ZRhGCBwcAMWpGN6NR9NN9ibbVlP0mB6xk2U7Y/vW1fpKB+Uy4f CoaY02YZKWiVsZDA== 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 11B9C13A21 for ; Tue, 21 May 2024 15:43:03 +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 sFTpAgfBTGbJGwAAD6G6ig (envelope-from ) for ; Tue, 21 May 2024 15:43:03 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 02/11] [gdb/macros] Handle 64-bit dwarf in gdb.base/fission-macro.exp Date: Tue, 21 May 2024 17:44:06 +0200 Message-Id: <20240521154415.9543-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20240521154415.9543-1-tdevries@suse.de> References: <20240521154415.9543-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: 2E5515C290 X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; 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)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_BLOCKED(0.00)[rspamd.com]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; DKIM_TRACE(0.00)[suse.de:+] X-Spam-Status: No, score=-12.3 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 When enabling 64-bit dwarf in the test-case gdb.base/fission-macro.exp, we run into: ... (gdb) break -qualified main^M DW_MACRO_define_strx pointing outside of .debug_str.dwo section \ [in module fission-macro-5-640.dwo]^M (gdb) FAIL: gdb.base/fission-macro.exp: dwarf_version=5: dwarf_bits=64: \ gdb_breakpoint: set breakpoint at main ... A dwarf-5 .debug_str_offsets section starts with a header consisting of: - an initial length (4 bytes for 32-bit and 12 bytes for 64-bit), - a 2 byte version string, and - 2 bytes padding so in total 8 bytes for 32-bit and 16 bytes for 64-bit. This offset is calculated here in dwarf_decode_macros: ... str_offsets_base = cu->header.addr_size; ... and in both cases this evaluates to 8. So in the 64-bit case, we interpret the last 8 bytes of the header as an offset. Fix this by computing str_offsets_base correctly for dwarf-5, for both the 32-bit and 64-bit case. Tested on x86_64-linux. Tested test-case using a current gcc trunk build, and gcc 14. --- gdb/dwarf2/read.c | 11 ++++++++++- gdb/testsuite/gdb.base/fission-macro.exp | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index e8416905163..4884553000a 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -21232,7 +21232,16 @@ dwarf_decode_macros (struct dwarf2_cu *cu, unsigned int offset, str_offsets_section = &cu->dwo_unit->dwo_file ->sections.str_offsets; str_section = &cu->dwo_unit->dwo_file->sections.str; - str_offsets_base = cu->header.addr_size; + if (cu->per_cu->version () <= 4) + str_offsets_base = cu->header.addr_size; + else + { + bfd *abfd = str_offsets_section->get_bfd_owner (); + unsigned int bytes_read = 0; + read_initial_length (abfd, str_offsets_section->buffer, &bytes_read, false); + const bool is_dwarf64 = bytes_read != 4; + str_offsets_base = is_dwarf64 ? 16 : 8; + } } else { diff --git a/gdb/testsuite/gdb.base/fission-macro.exp b/gdb/testsuite/gdb.base/fission-macro.exp index 705e3dd0c4b..4eb9c0efe21 100644 --- a/gdb/testsuite/gdb.base/fission-macro.exp +++ b/gdb/testsuite/gdb.base/fission-macro.exp @@ -67,7 +67,7 @@ proc do_tests { dwarf_version dwarf_bits strict_dwarf } { } foreach_with_prefix dwarf_version {5} { - foreach_with_prefix dwarf_bits {32} { + foreach_with_prefix dwarf_bits {32 64} { foreach_with_prefix strict_dwarf {0 1} { do_tests $dwarf_version $dwarf_bits $strict_dwarf }