From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 6F0DF384BC2D; Fri, 16 Sep 2022 14:34:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F0DF384BC2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1663338857; bh=juRxQu/GQtb+MLVT7oV1mPNUVZs5bd/Eo9sROJ1zEJI=; h=From:To:Subject:Date:From; b=MDMrlt0JJs0uzlAYrKVpgFDJ4114VZ8vKctdUjl//dkAwsDNOGnPIcLvzDrfjfQYC BT+t1ZRycUkyIJYM8oSB9cBmp4E5e960aJSbttuslJsClrjurOOoQnJpYyFvIwz7El Sr35fBHr0jzYDhE0tUTKXJbmXULUWxcpB8Mkw23M= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.dwarf2/dw2-dir-file-name.exp for aarch64 X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: faf01aee1d03aef5b6f95fd0db358bf5e70578f9 X-Git-Newrev: 77e6e213e0c8e77c53d123244ac75d6a825bda86 Message-Id: <20220916143417.6F0DF384BC2D@sourceware.org> Date: Fri, 16 Sep 2022 14:34:17 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D77e6e213e0c8= e77c53d123244ac75d6a825bda86 commit 77e6e213e0c8e77c53d123244ac75d6a825bda86 Author: Tom de Vries Date: Fri Sep 16 16:34:13 2022 +0200 [gdb/testsuite] Fix gdb.dwarf2/dw2-dir-file-name.exp for aarch64 =20 [ Another attempt at fixing the problem described in commit cd919f5533c ("[gdb/testsuite] Fix gdb.dwarf2/dw2-dir-file-name.exp"). ] =20 When running the test-case gdb.dwarf2/dw2-dir-file-name.exp with aarch64-linux, we run into: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, compdir_missing__ldir_missing__file_basename () at \ tmp-dw2-dir-file-name.c:999^M (gdb) FAIL: gdb.dwarf2/dw2-dir-file-name.exp: \ compdir_missing__ldir_missing__file_basename: continue to breakpoint:= \ compdir_missing__ldir_missing__file_basename ... =20 The breakpoint set at compdir_missing__ldir_missing__file_basename_labe= l, address 0x400608 starts at a line entry: ... CU: tmp-dw2-dir-file-name.c: File name Line number Starting address View = Stmt tmp-dw2-dir-file-name.c 999 0x400608 = x tmp-dw2-dir-file-name.c 1000 0x40062c = x tmp-dw2-dir-file-name.c - 0x40062c ... and therefore the breakpoint is printed without instruction address. =20 In contrast, for x86_64-linux, we have the breakpoint printed with inst= ruction address: ... (gdb) continue^M Continuing.^M ^M Breakpoint 2, 0x004004c1 in compdir_missing__ldir_missing__file_basenam= e () \ at tmp-dw2-dir-file-name.c:999^M (gdb) PASS: gdb.dwarf2/dw2-dir-file-name.exp: \ compdir_missing__ldir_missing__file_basename: continue to breakpoint:= \ compdir_missing__ldir_missing__file_basename ... =20 The breakpoint set at compdir_missing__ldir_missing__file_basename_labe= l, address 0x004004c1 doesn't start at a line entry: ... CU: tmp-dw2-dir-file-name.c: File name Line number Starting address View = Stmt tmp-dw2-dir-file-name.c 999 0x4004bd = x tmp-dw2-dir-file-name.c 1000 0x4004d3 = x tmp-dw2-dir-file-name.c - 0x4004d3 ... =20 Fix this by: - unifying behaviour between the archs by adding an explicit line numbe= r entry for the address compdir_missing__ldir_missing__file_basename_label, m= aking the FAIL reproducible on x86_64-linux. - expecting the breakpoint to be printed without instruction address. =20 Tested on x86_64-linux and aarch64-linux. Diff: --- gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite= /gdb.dwarf2/dw2-dir-file-name.exp index 053f7229537..3827ed744b5 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp @@ -188,13 +188,20 @@ proc out_line { name cu_dir cu_name line_dir line_nam= e } { =20 .Lline_${name}_lines: .byte 3 /* DW_LNS_advance_line */ - .sleb128 998 /* ... to 999 */ + .sleb128 997 /* ... to 998 */ .byte 0 /* DW_LNE_set_address */ .uleb128 ${addr_len}+1 .byte 2 .${addr_len}byte $name_start .byte 1 /* DW_LNS_copy */ .byte 3 /* DW_LNS_advance_line */ + .sleb128 1 /* ... to 999 */ + .byte 0 /* DW_LNE_set_address */ + .uleb128 ${addr_len}+1 + .byte 2 + .${addr_len}byte ${name}_label + .byte 1 /* DW_LNS_copy */ + .byte 3 /* DW_LNS_advance_line */ .sleb128 1 /* ... to 1000 */ .byte 0 /* DW_LNE_set_address */ .uleb128 ${addr_len}+1 @@ -451,19 +458,19 @@ proc test { func compdir filename } { } =20 gdb_breakpoint ${func}_label - gdb_continue_to_breakpoint $func "$func \\(\\) at .*" + gdb_test "continue" "$func \\(\\) at .*" "continue to $func" =20 gdb_test_no_output "set filename-display absolute" verbose -log "expect: ${absolute}" - gdb_test "frame" " in $func \\(\\) at [string_to_regexp ${absolute}]:999"= "absolute" + gdb_test "frame" "$func \\(\\) at [string_to_regexp ${absolute}]:999" "ab= solute" =20 gdb_test_no_output "set filename-display basename" verbose -log "expect: [file tail $filename]" - gdb_test "frame" " in $func \\(\\) at [string_to_regexp [file tail $filen= ame]]:999" "basename" + gdb_test "frame" "$func \\(\\) at [string_to_regexp [file tail $filename]= ]:999" "basename" =20 gdb_test_no_output "set filename-display relative" verbose -log "expect: $filename" - gdb_test "frame" " in $func \\(\\) at [string_to_regexp $filename]:999" "= relative" + gdb_test "frame" "$func \\(\\) at [string_to_regexp $filename]:999" "rela= tive" } }