From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 6D073385801D for ; Thu, 18 Mar 2021 00:04:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6D073385801D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=andrew.burgess@embecosm.com Received: by mail-wr1-x435.google.com with SMTP id 61so3592341wrm.12 for ; Wed, 17 Mar 2021 17:04:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/zRp/UV3Pu5gLn/Lff6JT2s/vDRp0xgY9XqmJ7NNVy4=; b=dJHnZi6P/udUJ7g4p043UkL4XjWDEvvGKoYmGYd380Ckg1tzJ1TVca3BJ/Ond3dne5 U5lGlQoEs7COsf7Ya51cJYHvyph0R+3iZg1Fg6WAsKnjs99l+Q/BiuPxzzATMx2G/hNT W1vo5t8JmKfEbABTG/yFAfZI/FDJQ5C52U7vH0XSNhMXi6fJ7OmSl++OTg1kQ61OXR8+ OtIrIKsS7wpSkSWetEKo1fe/3oT6HnZ548OrBh601lrLwn4wsOr65BufSEm+N+NTyKrK ohssVCfT+wfSdRLVRAcjlx4vqYOPx8oux60/HhIvNxYjqjZDGtyz6pYQKcAU2RGcH1zL CqJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=/zRp/UV3Pu5gLn/Lff6JT2s/vDRp0xgY9XqmJ7NNVy4=; b=dQod5WGlUOM3OoRdZPVJj3J2dsZcZTuYWAg8gp/2XH5e0ItXo3CT06DJWLo+aWCAD6 iD3qSoObLspVR6V7D36eZs0a/H91EoULxmIkxywKRPpydsYq7a0mLYzVH4LIBt8wBB0f Sow3iaEkO5AoLYTFfNMGsFBO7/Lo6swVWeyRq5RrU7rjBlzlPQrC7cc+fQH6iXZgLZU/ mcu8CIVb8PDw+p9eVblgVR35RJYYJhfWu2Lmr2FzIHnRLpcC8F3CA/5G5qOjK3o+VDgc z+6qibCyBAEZ2JLHDnZsdxbrqZ/0dycHPqU0mhmwgdJH2Am7BY1O3Ah91SYiIsUcTfJ2 0yng== X-Gm-Message-State: AOAM531uMo+IQHlGsXcCEy99MaTZGAZxzhdBaFnP0EQGRMqxtEwnrSQZ ah6vPKspZAy4PE5e1ABKmSKwK0QtjfpAWA== X-Google-Smtp-Source: ABdhPJz7vXMMVh4sJzFyq5wF4e60j8STJFA+3O3qh1XSiLtjqC5U0yBMk4fxsHumBga+Lc/Wnj26Zg== X-Received: by 2002:a5d:5047:: with SMTP id h7mr7022611wrt.111.1616025866247; Wed, 17 Mar 2021 17:04:26 -0700 (PDT) Received: from localhost (host86-134-238-232.range86-134.btcentralplus.com. [86.134.238.232]) by smtp.gmail.com with ESMTPSA id j13sm577517wrt.29.2021.03.17.17.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 17:04:25 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Subject: [PATCH] gdb/testsuite: use the correct .debug_str section name for DW_FORM_strp Date: Thu, 18 Mar 2021 00:04:23 +0000 Message-Id: <20210318000423.138492-1-andrew.burgess@embecosm.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 00:04:34 -0000 When handling DWARF attributes of the form DW_FORM_strp the strings should be placed in the .debug_str section, not .debug_string as they currently are by the DWARF assembler (in lib/dwarf.exp). I've added a test. This is as much to test the DWARF generator as it is to test GDB as GCC makes frequent use of DW_FORM_strp so we can be pretty sure this part of GDB is already well tested. gdb/testsuite/ChangeLog: * gdb.dwarf2/dw2-using-debug-str.c: New file. * gdb.dwarf2/dw2-using-debug-str.exp: New file. * lib/dwarf.exp (Dwarf::DW_FORM_strp): Create .debug_str section, not .debug_string. --- gdb/testsuite/ChangeLog | 7 ++ .../gdb.dwarf2/dw2-using-debug-str.c | 28 +++++ .../gdb.dwarf2/dw2-using-debug-str.exp | 101 ++++++++++++++++++ gdb/testsuite/lib/dwarf.exp | 2 +- 4 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.c create mode 100644 gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.c b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.c new file mode 100644 index 00000000000..27f7f0dfb4b --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.c @@ -0,0 +1,28 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2021 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 + . */ + +/* Our fake object. */ +int global_var[100]; + +int +main (int argc, char **argv) +{ + asm ("main_label: .globl main_label"); + + return 0; +} diff --git a/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp new file mode 100644 index 00000000000..3184f9078cb --- /dev/null +++ b/gdb/testsuite/gdb.dwarf2/dw2-using-debug-str.exp @@ -0,0 +1,101 @@ +# Copyright 2021 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 . + +# This test is as much about testing the lib/dwarf.exp DWARF generator +# as it is about testing GDB. At the time this test was written, this +# was the only test that generated any DWARF using DW_FORM_strp. + +load_lib dwarf.exp + +# This test can only be run on targets which support DWARF-2 and use gas. +if {![dwarf2_support]} { + return 0 +} + +standard_testfile .c -dw.S + +if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { + return -1 +} + +set asm_file [standard_output_file $srcfile2] +Dwarf::assemble $asm_file { + global srcfile + + cu {} { + compile_unit { + {language @DW_LANG_C} + {name ${srcfile}} + } { + declare_labels int4_type struct_type + + int4_type: DW_TAG_base_type { + {DW_AT_byte_size 4 DW_FORM_sdata} + {DW_AT_encoding @DW_ATE_signed} + {DW_AT_name integer} + } + + struct_type: DW_TAG_structure_type { + {DW_AT_name "foo_t" DW_FORM_strp} + {DW_AT_byte_size 12 DW_FORM_sdata} + } { + member { + {name "aa" DW_FORM_strp} + {type :$int4_type} + {data_member_location 0 data1} + } + member { + {name "bb" DW_FORM_strp} + {type :$int4_type} + {data_member_location 4 data1} + } + member { + {name "cc" DW_FORM_strp} + {type :$int4_type} + {data_member_location 8 data1} + } + } + + DW_TAG_variable { + {DW_AT_name global_var DW_FORM_strp} + {DW_AT_type :$struct_type} + {DW_AT_location { + DW_OP_addr [gdb_target_symbol global_var] + } SPECIAL_expr} + {external 1 flag} + } + + subprogram { + {external 1 flag} + {name main DW_FORM_strp} + {MACRO_AT_range {main}} + } + } + } +} + +if { [prepare_for_testing "failed to prepare" ${testfile} \ + [list $srcfile $asm_file] {nodebug}] } { + return -1 +} + +if ![runto_main] { + return -1 +} + +# Print the type of global_var. This type information is entirely +# fictional, it only exists in the DWARF, but it contains lots of nice +# field names, all of which are stored in the .debug_str section. +gdb_test "p global_var" " = \\{aa = 0, bb = 0, cc = 0\\}" diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp index f8fbd381810..4cd5e16c604 100644 --- a/gdb/testsuite/lib/dwarf.exp +++ b/gdb/testsuite/lib/dwarf.exp @@ -507,7 +507,7 @@ namespace eval Dwarf { if {![info exists _strings($value)]} { set _strings($value) [new_label strp] - _defer_output .debug_string { + _defer_output .debug_str { define_label $_strings($value) _op .ascii [_quote $value] } -- 2.25.4