From patchwork Wed May 15 07:27:41 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: 90168 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 9C3B93858D33 for ; Wed, 15 May 2024 07:27:09 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id 1D2E13858D20 for ; Wed, 15 May 2024 07:26:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1D2E13858D20 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 1D2E13858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715758007; cv=none; b=ftRXD7ZJJc61C8HlAqXrMFcS7yZXaqOzc+8vBsLDaoN5+jEFV6xsk8Hu+cj9bY6PQuc9THfXT4cEeo5BWOkOJTbXh02eUiNMcVbweu1UUwaShdGJ/D0Ge/Sq9zksg2lqwC3LWPXVjUfEygm+2GvYnD2Iqyx5sXW6K0xkwDEhQGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715758007; c=relaxed/simple; bh=jckGDXp0TYvwZquYU6zoVMLkqDeAPe1pWNxn3tP5G5Y=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=AHwigmd9HjKL5WPjsSwhHmbzlv+eTc+w83t0XHIKM2yL8dbDy3Ai9ylQ9M1kfUUob9l+H/N4ugPN+WC4cKiltTX3bKv/870B2ydNi53vk079qVWt5xs3x46ZmHxUiHAZN284mjiEex8gnUhiHwP76Oxm88ogd0WWvIe4zlxFPuc= 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-out1.suse.de (Postfix) with ESMTPS id C48CC3390D for ; Wed, 15 May 2024 07:26:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715758004; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=B0Tx9kPNPdXYbsLKbP3btYz5cBULYL1Q5UW7A78kZYQ=; b=DOrsvcVPV0w6MZQ1ON1yHct2XbKzxi0JboNSjxZr6Q4xcQUWublO5Q48ekN8K16Jucxx++ H+P2XKVrZ6B2hofOMUvZMYVueMlPCjyW8RdIog9tGzkvPsesmXCJsrwG04khvQRNfFmId+ Fxs9JrdWt6A288b9sPHQRE/CGeLwE90= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715758004; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=B0Tx9kPNPdXYbsLKbP3btYz5cBULYL1Q5UW7A78kZYQ=; b=L53EycBLbxDapFS1r5/OysmzFK1Od3UywYcQ7ILlN9nrZ0YvmOTiIuLRn2qfG2Yu47Kn3W kzhLy3g/+m1t0GBg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DOrsvcVP; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=L53EycBL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1715758004; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=B0Tx9kPNPdXYbsLKbP3btYz5cBULYL1Q5UW7A78kZYQ=; b=DOrsvcVPV0w6MZQ1ON1yHct2XbKzxi0JboNSjxZr6Q4xcQUWublO5Q48ekN8K16Jucxx++ H+P2XKVrZ6B2hofOMUvZMYVueMlPCjyW8RdIog9tGzkvPsesmXCJsrwG04khvQRNfFmId+ Fxs9JrdWt6A288b9sPHQRE/CGeLwE90= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1715758004; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=B0Tx9kPNPdXYbsLKbP3btYz5cBULYL1Q5UW7A78kZYQ=; b=L53EycBLbxDapFS1r5/OysmzFK1Od3UywYcQ7ILlN9nrZ0YvmOTiIuLRn2qfG2Yu47Kn3W kzhLy3g/+m1t0GBg== 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 AD0621372E for ; Wed, 15 May 2024 07:26:44 +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 WTHLKLRjRGbXYgAAD6G6ig (envelope-from ) for ; Wed, 15 May 2024 07:26:44 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Generate DW_MACRO_define_strp in dwarf assembly Date: Wed, 15 May 2024 09:27:41 +0200 Message-Id: <20240515072741.6437-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Score: -4.01 X-Rspamd-Action: no action X-Rspamd-Queue-Id: C48CC3390D X-Spam-Level: X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spamd-Result: default: False [-4.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; DWL_DNSWL_LOW(-1.00)[suse.de:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns] 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 Add support for DW_MACRO_define_strp in dwarf assembly, and use it in test-case gdb.dwarf2/macro-source-path.exp. Tested on x86_64-linux. --- .../gdb.dwarf2/macro-source-path.exp | 2 ++ gdb/testsuite/lib/dwarf.exp | 28 ++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) base-commit: f1fe1d35c855b9abaf1fb0a347e5de2e12994b1a diff --git a/gdb/testsuite/gdb.dwarf2/macro-source-path.exp b/gdb/testsuite/gdb.dwarf2/macro-source-path.exp index bcfd2f2f92c..b6b7b0bd2fd 100644 --- a/gdb/testsuite/gdb.dwarf2/macro-source-path.exp +++ b/gdb/testsuite/gdb.dwarf2/macro-source-path.exp @@ -125,6 +125,7 @@ proc do_test { test_name lines_version DW_AT_name main_file_idx directories # PR 29034). We're not trying to replicate that here, # this is not in the scope of this test. define 0 "ONE 1" + define_strp 0 "THREE 3" start_file 0 $::main_file_idx # A macro defined at line 1 of the main file. define 1 "TWO 2" @@ -144,6 +145,7 @@ proc do_test { test_name lines_version DW_AT_name main_file_idx directories gdb_test "print ONE" " = 1" gdb_test "print TWO" " = 2" + gdb_test "print THREE" " = 3" } } } diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index 44862dbb339..5b23a60af8e 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -549,6 +549,9 @@ namespace eval Dwarf { # The current CU's offset size. variable _cu_offset_size + # The current macro unit's offset size. + variable _mu_offset_size + # Label generation number. variable _label_num @@ -2229,6 +2232,8 @@ namespace eval Dwarf { if { ${is-64} } { set flags [expr $flags | 0x1] } + variable _mu_offset_size + set _mu_offset_size [expr ${is-64} ? 8 : 4] if { ${debug-line-offset-label} != "" } { set flags [expr $flags | 0x2] @@ -2241,11 +2246,12 @@ namespace eval Dwarf { "debug_line offset" } + with_override Dwarf::define_strp Dwarf::_macro_unit_define_strp { with_override Dwarf::define Dwarf::_macro_unit_define { with_override Dwarf::start_file Dwarf::_macro_unit_start_file { with_override Dwarf::end_file Dwarf::_macro_unit_end_file { uplevel $body - }}} + }}}} } # Emit a DW_MACRO_define entry. @@ -2256,6 +2262,26 @@ namespace eval Dwarf { _op .asciz "\"$text\"" "Macro definition" } + # Emit a DW_MACRO_define_strp entry. + + proc _macro_unit_define_strp { lineno text } { + _op .byte 0x5 "DW_MACRO_define_strp" + _op .uleb128 $lineno "Line number" + + variable _strings + variable _mu_offset_size + + if {![info exists _strings($text)]} { + set _strings($text) [new_label strp] + _defer_output .debug_str { + define_label $_strings($text) + _op .ascii [_quote $text] + } + } + + _op_offset $_mu_offset_size "$_strings($text)" "strp: $text" + } + # Emit a DW_MACRO_start_file entry. proc _macro_unit_start_file { lineno file_idx } {