From patchwork Mon Jun 1 14:23:06 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 136188 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EA10C4BA2E20 for ; Mon, 1 Jun 2026 14:23:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EA10C4BA2E20 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=G64XR34h X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-oi1-x235.google.com (mail-oi1-x235.google.com [IPv6:2607:f8b0:4864:20::235]) by sourceware.org (Postfix) with ESMTPS id 11F734BA5436 for ; Mon, 1 Jun 2026 14:23:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 11F734BA5436 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 11F734BA5436 Authentication-Results: sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::235 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780323791; cv=none; b=dhCdCLwBe5q/KG6njjQxmbfk0BDgIvI57JiiRKRzaYevbnoIu6777hUGLd4JGtJuniChfXvX2GxucUuVQsjm/PbwpSpHYIukBUfGn+uEJ9Wcwmt1BWgrcyuJXtuHK8yv+FxixRulC6CZsElCDErbAITphjWI3ece8HZfJWKo83U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1780323791; c=relaxed/simple; bh=y6mVIvMBjbELzpw7IYIxoZsPvIV+eH+eqU5oVsboARM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TfCNcMvtZ9NKa2qsIugk9N2e8h9153NffuW8tIqZDDxzt9yJwhDeS7Gv1pUAVfVzgro+4XrbYNIEbjN8AhVhS+oRR43KNonUpxO+Fx+HVCgaolZfHqfyjXGQmpZfXRhNNWCmuRtUNBdkDFt9hCjbR6jwtONvt1PnXPEzA7Vez8w= ARC-Authentication-Results: i=1; sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=G64XR34h DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11F734BA5436 Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-4862ed6ab36so347741b6e.1 for ; Mon, 01 Jun 2026 07:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1780323790; x=1780928590; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3QjMx2UABU7Xl8rJ1ExBkqiwINJnNlSLsleE07DiQnY=; b=G64XR34huXwQye4/cpEj5bCP5DFS+QYIzd0+f9skPAjAYX/edPDXMSd9HiZPi4ovac bgMznBjHdt1e+6Gla3N1HD1wStSHufY8NjSH4CWA4AXZMFtMq16yML2cvFAbKekbwgGH DMS5KgNwIdyqPnEfaUCvFPjbH8hLj56dyCQiIugWQjBTw5USFVlwVLB9ETSCwy2s71xa wdsktpC0UTWvCcwpy3e8ss1bY4vtChVUOzzrCwXrzdrjvbE5ovuzbOtQRQV2+2RIXRG8 tL4tEiTontQ8xsqwFS5kmxmn+CUl7fo2EJb0DbpdgS1arQlsEQxruoXhqdL0kjBB0fzj fj5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780323790; x=1780928590; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3QjMx2UABU7Xl8rJ1ExBkqiwINJnNlSLsleE07DiQnY=; b=e4Q3GyDOsNmG0n7vKtaOU+w9sum6buuS0rIE5tNZ8Tgwp52lpnRLThIvA/7NoOt2Vr LPcV+h8SMXcc5R4e8r/I5dlKME/P262qnkJ5qAb6pkzxrLISay4rffamuLqGPTnxQkUR uuybdTsf0XTbLcIg62PAW5ziy62Ocr6Ih8kZ7h3T94NsU9Hjltv/J1iZ1PA7pMPckS+l bfkkEXt90GhlAOhtuKF46SuW7kEWGwvb13qo0KwyY4fv0xWnU6CRastKTRt9N8RNNVro d3gyj4FI/hfHI1FuwCCPnYrNEhSAea/EcZmmit7xdjKq6x3LCwtSLhqYWtRwSZW1H2Hp 9AZw== X-Gm-Message-State: AOJu0YyGMNIMBr7hUD5q+KLIDwoVrK/gkOaSwh5DmtOfTI7phPP5gzyb GAcOWyPTFfOjRS7iyU4VPsxCW1gD02kcwc4GQZ0V55JMmoZTcHe8FiDHqTvqjZjc1OoCCVtrMz3 ZcI8= X-Gm-Gg: Acq92OG84PldxVFkYtu9FU2s529dDC/dIYmtBy4uXibyWrFkZCVqeBl+3EjY4awt58Y 34Vyx675TSJBl1T4ZcrwhNWrmvVEM11FLraHmh2syXEvktBJi8bcgfATEBjH4wWSSj0r6mV7Bi5 KQrCQ8IrhmiYG63nnzf54cRSob/3X9RnhfMbYzuOHb1OK5e3oUjev7NX7tHoWkLngnp94ChC+mN jMqjJfX7gEJ8GzjsJicTKBs4J9EZNwGBJIQJGpfixXglN2bv4ZLy6qQ0SCWuulDfVmLTtf1rsJa AnJijh9nLWRyQ7MOXXPdMWwHAMM16XFtIlpEntV+dtMQfqkira6msQPOlqqdA1vp0bv+FBoL6Jl yltB+RJM2DkFftRJaKGgW3YIFjA5ZujCgaD3fagWt2/ykD/9FebergcujK6EWgGCNOjhM8kGkGn 8rjseOywuIXwtMQS+Lnjohc1jE2DfEzkRNTN9dt8YUO1+ShwUhZ88HKg== X-Received: by 2002:a05:6808:1597:b0:47b:c2a2:1c79 with SMTP id 5614622812f47-485fb217722mr6249392b6e.1.1780323790164; Mon, 01 Jun 2026 07:23:10 -0700 (PDT) Received: from bapiya (75-166-225-82.hlrn.qwest.net. [75.166.225.82]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e695d69b20sm7781630a34.22.2026.06.01.07.23.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jun 2026 07:23:09 -0700 (PDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2] Convert dw2-const.exp to use the DWARF assembler Date: Mon, 1 Jun 2026 08:23:06 -0600 Message-ID: <20260601142306.897366-1-tromey@adacore.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLOCKED shortcircuit=no autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on 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 This patch converts dw2-const.exp to use the DWARF assembler rather than a .S file. The conversion was largely done using the script from contrib. Following a suggestion from Tom de Vries, this version sets addr_size to 8. This makes the test pass with -m32 as well. --- gdb/testsuite/gdb.dwarf2/dw2-const.S | 266 ------------------------- gdb/testsuite/gdb.dwarf2/dw2-const.exp | 58 +++++- 2 files changed, 47 insertions(+), 277 deletions(-) delete mode 100644 gdb/testsuite/gdb.dwarf2/dw2-const.S base-commit: 48e2cc4f25491becead62276a39d30aa201166ef diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.S b/gdb/testsuite/gdb.dwarf2/dw2-const.S deleted file mode 100644 index 1161633f181..00000000000 --- a/gdb/testsuite/gdb.dwarf2/dw2-const.S +++ /dev/null @@ -1,266 +0,0 @@ -/* This testcase is part of GDB, the GNU debugger. - - Copyright 2010-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 . */ - -#if PTRBITS == 64 -# define PTRBYTE .8byte -# define PTRBYTES 8 -#elif PTRBITS == 32 -# define PTRBYTE .4byte -# define PTRBYTES 4 -#else -# error "Unsupported pointer size" -#endif - -/* Dummy function to provide debug information for. */ - - .text -.Lbegin_text1: - .globl func_cu1 - .type func_cu1, %function -func_cu1: -.Lbegin_func_cu1: - .int 0 -.Lend_func_cu1: - .size func_cu1, .-func_cu1 -.Lend_text1: - -/* Debug information */ - - .section .debug_info -.Lcu1_begin: - /* CU header */ - .4byte .Lcu1_end - .Lcu1_start /* Length of Compilation Unit */ -.Lcu1_start: - .2byte 2 /* DWARF Version */ - .4byte .Labbrev1_begin /* Offset into abbrev section */ - .byte 8 /* Pointer size */ - - /* CU die */ - .uleb128 1 /* Abbrev: DW_TAG_compile_unit */ - .4byte .Lline1_begin /* DW_AT_stmt_list */ - .ascii "file1.txt\0" /* DW_AT_name */ - .ascii "GNU C 3.3.3\0" /* DW_AT_producer */ - .byte 1 /* DW_AT_language (C) */ - - .uleb128 0x8 /* Abbrev: DW_TAG_constant */ - .ascii "twelve\0" /* DW_AT_name */ - .4byte .Ltype_const-.Lcu1_begin /* DW_AT_type */ - .byte 0xc /* DW_AT_const_value */ - -.Ltype_const: - .uleb128 0x9 /* Abbrev: DW_TAG_const_type */ - .4byte .Ltype_int-.Lcu1_begin /* DW_AT_type */ - - .uleb128 0xa /* Abbrev: DW_TAG_variable */ - .ascii "val8\0" /* DW_AT_name */ - .4byte .Ltype_const8-.Lcu1_begin /* DW_AT_type */ - .byte 2f - 1f /* DW_AT_location */ -1: .byte 0x11 /* DW_OP_consts */ -#if 0 /* gas encodes it explicitly. */ - .slab128 0xffffffff00000000 -#endif -#if 0 /* gas encoded it correctly - formed GDB FAILed. */ - .sleb128 -4294967296 -#endif -#if 1 /* Rather encode sleb128 by hand. */ - .byte 0x80, 0x80, 0x80, 0x80, 0x70 -#endif - .byte 0x9f /* DW_OP_stack_value */ -2: - -.Ltype_const8: - .uleb128 0x9 /* Abbrev: DW_TAG_const_type */ - .4byte .Ltype_int8-.Lcu1_begin /* DW_AT_type */ - - /* func_cu1 */ - .uleb128 2 /* Abbrev: DW_TAG_subprogram */ - .byte 1 /* DW_AT_external */ - .byte 1 /* DW_AT_decl_file */ - .byte 2 /* DW_AT_decl_line */ - .ascii "func_cu1\0" /* DW_AT_name */ - .4byte .Ltype_int-.Lcu1_begin /* DW_AT_type */ - .byte 1 /* DW_AT_frame_base: length */ - .byte 0x55 /* DW_AT_frame_base: DW_OP_reg5 */ - -.Ltype_int: - .uleb128 3 /* Abbrev: DW_TAG_base_type */ - .ascii "int\0" /* DW_AT_name */ - .byte 4 /* DW_AT_byte_size */ - .byte 5 /* DW_AT_encoding */ - -.Ltype_int8: - .uleb128 3 /* Abbrev: DW_TAG_base_type */ - .ascii "int8\0" /* DW_AT_name */ - .byte 8 /* DW_AT_byte_size */ - .byte 5 /* DW_AT_encoding */ - - .byte 0 /* End of children of CU */ - -.Lcu1_end: - -/* Abbrev table */ - .section .debug_abbrev -.Labbrev1_begin: - .uleb128 1 /* Abbrev code */ - .uleb128 0x11 /* DW_TAG_compile_unit */ - .byte 1 /* has_children */ - .uleb128 0x10 /* DW_AT_stmt_list */ - .uleb128 0x6 /* DW_FORM_data4 */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0x8 /* DW_FORM_string */ - .uleb128 0x25 /* DW_AT_producer */ - .uleb128 0x8 /* DW_FORM_string */ - .uleb128 0x13 /* DW_AT_language */ - .uleb128 0xb /* DW_FORM_data1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 2 /* Abbrev code */ - .uleb128 0x2e /* DW_TAG_subprogram */ - .byte 0 /* has_children */ - .uleb128 0x3f /* DW_AT_external */ - .uleb128 0xc /* DW_FORM_flag */ - .uleb128 0x3a /* DW_AT_decl_file */ - .uleb128 0xb /* DW_FORM_data1 */ - .uleb128 0x3b /* DW_AT_decl_line */ - .uleb128 0xb /* DW_FORM_data1 */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0x8 /* DW_FORM_string */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .uleb128 0x40 /* DW_AT_frame_base */ - .uleb128 0xa /* DW_FORM_block1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 3 /* Abbrev code */ - .uleb128 0x24 /* DW_TAG_base_type */ - .byte 0 /* has_children */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0x8 /* DW_FORM_string */ - .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 0x8 /* abbrev code */ - .uleb128 0x27 /* TAG: DW_TAG_constant */ - .byte 0x0 /* DW_children_no */ - .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 0xb /* DW_FORM_data1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .uleb128 0x9 /* abbrev code */ - .uleb128 0x26 /* TAG: 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 0xa /* abbrev code */ - .uleb128 0x34 /* TAG: DW_TAG_variable */ - .byte 0x0 /* DW_children_no */ - .uleb128 0x3 /* DW_AT_name */ - .uleb128 0x8 /* DW_FORM_string */ - .uleb128 0x49 /* DW_AT_type */ - .uleb128 0x13 /* DW_FORM_ref4 */ - .uleb128 0x02 /* DW_AT_location */ - .uleb128 0xa /* DW_FORM_block1 */ - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - - .byte 0x0 /* Terminator */ - .byte 0x0 /* Terminator */ - -/* Line table */ - .section .debug_line -.Lline1_begin: - .4byte .Lline1_end - .Lline1_start /* Initial length */ -.Lline1_start: - .2byte 2 /* Version */ - .4byte .Lline1_lines - .Lline1_hdr /* header_length */ -.Lline1_hdr: - .byte 1 /* Minimum insn length */ - .byte 1 /* default_is_stmt */ - .byte 1 /* line_base */ - .byte 1 /* line_range */ - .byte 0x10 /* opcode_base */ - - /* Standard lengths */ - .byte 0 - .byte 1 - .byte 1 - .byte 1 - .byte 1 - .byte 0 - .byte 0 - .byte 0 - .byte 1 - .byte 0 - .byte 0 - .byte 1 - .byte 0 - .byte 0 - .byte 0 - - /* Include directories */ - .byte 0 - - /* File names */ - .ascii "file1.txt\0" - .uleb128 0 - .uleb128 0 - .uleb128 0 - - .byte 0 - -.Lline1_lines: - .byte 0 /* DW_LNE_set_address */ - .uleb128 1 + PTRBYTES - .byte 2 - PTRBYTE .Lbegin_func_cu1 - - .byte 3 /* DW_LNS_advance_line */ - .sleb128 3 /* ... to 4 */ - - .byte 1 /* DW_LNS_copy */ - - .byte 1 /* DW_LNS_copy (second time as an end-of-prologue marker) */ - - .byte 0 /* DW_LNE_set_address */ - .uleb128 1 + PTRBYTES - .byte 2 - PTRBYTE .Lend_func_cu1 - - .byte 0 /* DW_LNE_end_of_sequence */ - .uleb128 1 - .byte 1 - -.Lline1_end: -#ifdef __arm__ - .section .note.GNU-stack,"",%progbits -#else - .section .note.GNU-stack,"",@progbits -#endif diff --git a/gdb/testsuite/gdb.dwarf2/dw2-const.exp b/gdb/testsuite/gdb.dwarf2/dw2-const.exp index f855659f8bd..41baf2ae18d 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-const.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-const.exp @@ -17,20 +17,56 @@ 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 -debug.S -if {[is_ilp32_target]} { - set ptrbits 32 -} else { - set ptrbits 64 -} +# Set up the DWARF for the test. + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcdir subdir srcfile + declare_labels int int8 const_type const_type_2 -set srcfile_opts {} -lappend srcfile_opts nodebug -lappend srcfile_opts additional_flags=-DPTRBITS=$ptrbits + cu {version 2 addr_size 8} { + DW_TAG_compile_unit { + DW_AT_name file1.txt DW_FORM_string + DW_AT_producer {GNU C 3.3.3} DW_FORM_string + DW_AT_language @DW_LANG_C89 + } { + DW_TAG_constant { + DW_AT_name twelve DW_FORM_string + DW_AT_type :$const_type_2 + DW_AT_const_value 12 DW_FORM_data1 + } + const_type_2: DW_TAG_const_type { + DW_AT_type :$int + } + DW_TAG_variable { + DW_AT_name val8 DW_FORM_string + DW_AT_type :$const_type + DW_AT_location { + DW_OP_consts -4294967296 + DW_OP_stack_value + } SPECIAL_expr + } + const_type: DW_TAG_const_type { + DW_AT_type :$int8 + } + int: DW_TAG_base_type { + DW_AT_name int DW_FORM_string + DW_AT_byte_size 4 DW_FORM_data1 + DW_AT_encoding @DW_ATE_signed + } + int8: DW_TAG_base_type { + DW_AT_name int8 DW_FORM_string + DW_AT_byte_size 8 DW_FORM_data1 + DW_AT_encoding @DW_ATE_signed + } + } + } +} -if {[prepare_for_testing_full "failed to prepare" \ - [list $testfile debug main.c debug $srcfile $srcfile_opts]]} { +if {[prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] nodebug]} { return }