From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CmkxKgAIJ2pVdzwAWB0awg (envelope-from ) for ; Mon, 08 Jun 2026 14:20:48 -0400 Authentication-Results: simark.ca; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=gbxLdUp8; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d1ge7G3B; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=uf4mC7eP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Z0KQYJAv; dkim-atps=neutral Received: by simark.ca (Postfix, from userid 112) id 9AD991E0A3; Mon, 08 Jun 2026 14:20:48 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-25) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-5.4 required=5.0 tests=ARC_SIGNED,ARC_VALID,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=4.0.1 Received: from vm01.sourceware.org (vm01.sourceware.org [38.145.34.32]) (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 40DFF1E062 for ; Mon, 08 Jun 2026 14:20:47 -0400 (EDT) Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C2F4851A4330 for ; Mon, 8 Jun 2026 18:20:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C2F4851A4330 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=gbxLdUp8; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d1ge7G3B; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=uf4mC7eP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Z0KQYJAv 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 051D54B19707 for ; Mon, 8 Jun 2026 18:20:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 051D54B19707 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 051D54B19707 Authentication-Results: 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=1780942818; cv=none; b=ZmJAO9yNUXDEd4RZOPd7RiFkNlARiVK6GLdNfZDBkVvoaY1pvIlYmoioRSCRpuRqGoI+BrQUqBYMev8LMwjQDShPLJRN8O4Noi5HdE3ISZm4SjtW9cVvcBxbeewiDp4L87EmdLDjUnU5eZYJrdCye5cU76pY59RkCazA1qQXlyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780942818; c=relaxed/simple; bh=g0jBUzXPpwwRH20hH9fPKSyO6qSmG0bQ+LhfKSRVwEU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-ID:MIME-Version; b=sCf2Iv7yEaSCL6rPnl++y7gtRNMAugWq49/lGG7dUEr69qDUsDj/Ld0pKCzcypdMJJ6g6kzv2rqQihfzhF0ye4MsFB1QBgAod8guTnNexS3hsUJTZ6hw8ANrag11d5oojRCVaBU2EiIJRWAUsN48RNytV8wj9OOnHsi16uXSUn8= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=gbxLdUp8; dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=d1ge7G3B; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.a=rsa-sha256 header.s=susede2_rsa header.b=uf4mC7eP; dkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256 header.s=susede2_ed25519 header.b=Z0KQYJAv DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 051D54B19707 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 E3D9C68172 for ; Mon, 8 Jun 2026 18:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780942817; 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=DrbptV03XsHjr2yspDNtYGuRRXj726ABzUrxsibucTw=; b=gbxLdUp8ulDyRwpjMMSKkuMWsPg8zC66ApNEAotTnOBnKsVNGwZcWTZkVZ3EtrsOglXlyo OJvsy7HufbIYoxHLXErCx7/dnvRjKBkkc0jj93kHCfk6SUDtS3t0hlRbFMZByCza+LOr+o 1Xo6jjOutxAdMrFKNYaotfX77937+zI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780942817; 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=DrbptV03XsHjr2yspDNtYGuRRXj726ABzUrxsibucTw=; b=d1ge7G3BapCg7EThRj4+yfigomOzUYFVnav+Fxf3k4uwOzVzCPv+KjW8Lq+NLj/RCdj248 rG4LgcWi5pcwJaAw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=uf4mC7eP; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Z0KQYJAv DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780942816; 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=DrbptV03XsHjr2yspDNtYGuRRXj726ABzUrxsibucTw=; b=uf4mC7ePPHWcHPHdfTVjTKkTkNehoRkywknsxzum3lEYkSnqWxTchKp3vxNuF1d7GiHYxs q13zjI8S3gBvCz0NAyx17U5SuG7M4rTSSBUVeCFwO0VwjZf89v0j0ub62YK7vIqkck3Mio KG9aXF/uA1N5z1mkNgbp24AtmyibY1s= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780942816; 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=DrbptV03XsHjr2yspDNtYGuRRXj726ABzUrxsibucTw=; b=Z0KQYJAv9QeqW2YHxZCsC0iIZYGtxP/mMc0PaUuJjFBCA0dL+pk4p6hAtbfDmW8VNzCD95 rRUujUnjS7kPLjDw== 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 D0909779A7 for ; Mon, 8 Jun 2026 18:20:16 +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 ciSzMeAHJ2qnJwAAD6G6ig (envelope-from ) for ; Mon, 08 Jun 2026 18:20:16 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH] [gdb/testsuite] Convert gdb.dwarf2/dw2-strp.exp to dwarf assembly Date: Mon, 8 Jun 2026 20:20:16 +0200 Message-ID: <20260608182016.3993784-1-tdevries@suse.de> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action 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)[]; 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)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_TRACE(0.00)[suse.de:+]; MIME_TRACE(0.00)[0:+]; 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)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid, suse.de:dkim, imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, gnu.org:url] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: E3D9C68172 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 Convert gdb.dwarf2/dw2-strp.exp to dwarf assembly using gdb/contrib/dwarf-to-dwarf-assembler.py. Tested on x86_64-linux. --- gdb/testsuite/gdb.dwarf2/dw2-strp.S | 187 -------------------------- gdb/testsuite/gdb.dwarf2/dw2-strp.exp | 65 ++++++++- 2 files changed, 59 insertions(+), 193 deletions(-) delete mode 100644 gdb/testsuite/gdb.dwarf2/dw2-strp.S diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.S b/gdb/testsuite/gdb.dwarf2/dw2-strp.S deleted file mode 100644 index 69a790f036b..00000000000 --- a/gdb/testsuite/gdb.dwarf2/dw2-strp.S +++ /dev/null @@ -1,187 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2008-2026 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ - -/* Debug information */ - - .section .debug_info -.Lcu1_begin: - .4byte .Lcu1_end - .Lcu1_start /* Length of Compilation Unit */ -.Lcu1_start: - .2byte 2 /* DWARF version number */ - .4byte .Ldebug_abbrev0 /* Offset Into Abbrev. Section */ - .byte 4 /* Pointer Size (in bytes) */ - - /* CU die */ - .uleb128 1 /* Abbrev: DW_TAG_compile_unit */ - .4byte .Lproducer /* DW_AT_producer */ - /* Use C++ to exploit a bug in parsing DW_AT_name "". */ - .byte 4 /* DW_AT_language (C++) - */ - -.Larray_type: - .uleb128 2 /* Abbrev: DW_TAG_array_type */ - .4byte .Lchar_type-.Lcu1_begin /* DW_AT_type */ - - .uleb128 3 /* Abbrev: DW_TAG_subrange_type */ - .4byte .Luint_type-.Lcu1_begin /* DW_AT_type */ - .byte 0xd /* DW_AT_upper_bound */ - .byte 0 /* End of children of die */ - -.Luint_type: - .uleb128 4 /* Abbrev: DW_TAG_base_type */ - .4byte .Luint_str /* DW_AT_name */ - .byte 4 /* DW_AT_byte_size */ - .byte 7 /* DW_AT_encoding */ - -.Lchar_type: - .uleb128 4 /* Abbrev: DW_TAG_base_type */ - .4byte .Lchar_str /* DW_AT_name */ - .byte 1 /* DW_AT_byte_size */ - .byte 6 /* DW_AT_encoding */ - - .uleb128 5 /* Abbrev: DW_TAG_variable DW_FORM_strp */ - .4byte .Lvarname /* DW_AT_name */ - .4byte .Lconst_type-.Lcu1_begin/* DW_AT_type */ - .4byte .Lvarcontents /* DW_AT_const_value */ - .byte 1 /* DW_AT_external */ - - .uleb128 6 /* Abbrev: DW_TAG_variable DW_FORM_string */ - .string "a_string2" /* DW_AT_name */ - .4byte .Lconst_type-.Lcu1_begin/* DW_AT_type */ - .string "hello world2\n" /* DW_AT_const_value */ - .byte 1 /* DW_AT_external */ - -.Lconst_type: - .uleb128 7 /* Abbrev: DW_TAG_const_type */ - .4byte .Larray_type-.Lcu1_begin/* DW_AT_type */ - - .uleb128 8 /* Abbrev: DW_TAG_variable (name "") */ - .4byte .Lemptyname /* DW_AT_name */ - - .byte 0 /* End of children of CU */ -.Lcu1_end: - - .section .debug_abbrev -.Ldebug_abbrev0: - .uleb128 1 /* Abbrev code */ - .uleb128 0x11 /* DW_TAG_compile_unit */ - .byte 0x1 /* has_children */ - .uleb128 0x25 /* DW_AT_producer */ - .uleb128 0xe /* DW_FORM_strp */ - .uleb128 0x13 /* DW_AT_language */ - .uleb128 0xb /* DW_FORM_data1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 2 /* Abbrev code */ - .uleb128 0x1 /* TAG: DW_TAG_array_type */ - .byte 0x1 /* DW_children_yes */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 3 /* Abbrev code */ - .uleb128 0x21 /* DW_TAG_subrange_type */ - .byte 0x0 /* no children */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .uleb128 0x2f /* DW_AT_upper_bound */ - .uleb128 0xb /* DW_FORM_data1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 4 /* Abbrev code */ - .uleb128 0x24 /* DW_TAG_base_type */ - .byte 0x0 /* no_children */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0xe /* DW_FORM_strp */ - .uleb128 0xb /* DW_AT_byte_size */ - .uleb128 0xb /* DW_FORM_data1 */ - .uleb128 0x3e /* DW_AT_encoding */ - .uleb128 0xb /* DW_FORM_data1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 5 /* Abbrev code */ - .uleb128 0x34 /* DW_TAG_variable */ - .byte 0x0 /* no_children */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0xe /* DW_FORM_strp */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .uleb128 0x1c /* DW_AT_const_value */ - .uleb128 0xe /* DW_FORM_strp */ - .uleb128 0x3f /* DW_AT_external */ - .uleb128 0xc /* DW_FORM_flag */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 6 /* Abbrev code */ - .uleb128 0x34 /* DW_TAG_variable */ - .byte 0x0 /* no_children */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0x8 /* DW_FORM_string */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .uleb128 0x1c /* DW_AT_const_value */ - .uleb128 0x8 /* DW_FORM_string */ - .uleb128 0x3f /* DW_AT_external */ - .uleb128 0xc /* DW_FORM_flag */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 7 /* Abbrev code */ - .uleb128 0x26 /* DW_TAG_const_type */ - .byte 0x0 /* DW_children_no */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 8 /* Abbrev code */ - .uleb128 0x34 /* DW_TAG_variable */ - .byte 0x0 /* DW_children_no */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0xe /* DW_FORM_strp */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .byte 0x0 /* Terminator */ - -/* String table */ -#ifdef __arm__ - .section .debug_str,"MS",%progbits,1 -#else - .section .debug_str,"MS",@progbits,1 -#endif -.Lproducer: - .string "GNU C 3.3.3" -.Lchar_str: - .string "char" -.Luint_str: - .string "unsigned int" -.Lvarname: - .string "a_string" -.Lvarcontents: - .string "hello world!\n" -.Lemptyname: - .string "" -#ifdef __arm__ - .section .note.GNU-stack,"",%progbits -#else - .section .note.GNU-stack,"",@progbits -#endif diff --git a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp index 7dbc94f57ca..991c6323197 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-strp.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-strp.exp @@ -20,15 +20,68 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-2 and use gas. require dwarf2_support -standard_testfile .S +standard_testfile main.c .S + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + declare_labels char const_type array_type unsigned_int + + cu {version 2} { + DW_TAG_compile_unit { + DW_AT_producer {GNU C 3.3.3} DW_FORM_strp + DW_AT_language @DW_LANG_C_plus_plus + } { + array_type: DW_TAG_array_type { + DW_AT_type :$char + } { + DW_TAG_subrange_type { + DW_AT_type :$unsigned_int + DW_AT_upper_bound 13 DW_FORM_data1 + } + } + unsigned_int: DW_TAG_base_type { + DW_AT_name {unsigned int} DW_FORM_strp + DW_AT_byte_size 4 DW_FORM_data1 + DW_AT_encoding @DW_ATE_unsigned + } + char: DW_TAG_base_type { + DW_AT_name char DW_FORM_strp + DW_AT_byte_size 1 DW_FORM_data1 + DW_AT_encoding @DW_ATE_signed_char + } + DW_TAG_variable { + DW_AT_name a_string DW_FORM_strp + DW_AT_type :$const_type + DW_AT_const_value {hello world!\n} DW_FORM_strp + DW_AT_external 1 DW_FORM_flag + } + DW_TAG_variable { + DW_AT_name a_string2 DW_FORM_string + DW_AT_type :$const_type + DW_AT_const_value {hello world2\n} DW_FORM_string + DW_AT_external 1 DW_FORM_flag + } + const_type: DW_TAG_const_type { + DW_AT_type :$array_type + } + DW_TAG_variable { + DW_AT_name DW_FORM_strp + } + } + } +} if {[prepare_for_testing_full "failed to prepare" \ - [list $testfile debug main.c debug $srcfile nodebug]]} { + [list $testfile debug $srcfile nodebug $asm_file nodebug]]} { return } -gdb_test "p a_string" " = \"hello world!\\\\n\"" -gdb_test "ptype a_string" "type = const char \\\[14\\\]" +gdb_test "p a_string" \ + [string_to_regexp { = "hello world!\n"}] +gdb_test "ptype a_string" \ + [string_to_regexp {type = const char [14]}] -gdb_test "p a_string2" " = \"hello world2\\\\n\"" -gdb_test "ptype a_string2" "type = const char \\\[14\\\]" +gdb_test "p a_string2" \ + [string_to_regexp { = "hello world2\n"}] +gdb_test "ptype a_string2" \ + [string_to_regexp {type = const char [14]}] base-commit: 748350ae9e20d4698527c57bb3d3d76a33242cab -- 2.51.0