[v2,3/4,gdb/testsuite] Fix end_sequence addresses
Checks
| Context |
Check |
Description |
| linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_gdb_build--master-arm |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_gdb_check--master-arm |
success
|
Testing passed
|
| linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
...
00000000004102c4 <end_of_sequence>:
4102c4: 52800000 mov w0, #0x0 // #0
4102c8: 9100c3ff add sp, sp, #0x30
4102cc: d65f03c0 ret
...
is not described by the line table:
...
File name Line number Starting address View Stmt
...
map-to-same-line.c 54 0x4102ac x
map-to-same-line.c - 0x4102c4
...
Fix this by ending the line table at $main_end.
Likewise in a few other test-cases, found using:
...
$ find gdb/testsuite/ -type f \
| xargs grep -B1 DW_LNE_end_sequence \
| grep set_address \
| egrep -v "_end|_len"
...
Tested on aarch64-linux.
---
gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
10 files changed, 16 insertions(+), 11 deletions(-)
Comments
Tom:
I am seeing a regression on Power 10 with this patch. Specifically the change to file dw2-lines.exp.
--- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
@@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
line [line_for bar_label_4]
DW_LNS_copy
- DW_LNE_set_address bar_label_5
+ DW_LNE_set_address "$main_start + $main_len"
DW_LNE_end_sequence
}
}
The change results in the test failing on PowerPC.
Running /home/carll/GDB/build-current/gdb/testsuite/../../../binutils-gdb-current/gdb/testsuite/gdb.dwarf2/dw2-lines.exp ...
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: continue to breakpoint: foo \(1\) (the program exited)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: next to foo (2) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: next to foo (3) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: next to foo (4) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: continue to breakpoint: foo \(1\) (the program exited)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: next to foo (2) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: next to foo (3) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: next to foo (4) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: continue to breakpoint: foo \(1\) (the program exited)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: next to foo (2) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: next to foo (3) (the program is no longer running)
FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: next to foo (4) (the program is no longer running)
etc.
If I edit the file and change the line back to bar_label_5 the test passes. I am only seeing an issue with the change to in this file. I specifically tested dw2-inline-header-2.exp and the change seems to work just fine there. I am really puzzled as to why it doesn't work in file dw2-lines.exp.
I put the print statement in:
puts "CARLL, main_start = $main_start, main_len = $main_len"
DW_LNE_set_address "$main_start + $main_len"
I get
CARLL, main_start = main_label - 28, main_len = 76
I tried printing main_label but it doesn't seem to be defined.
ERROR: in testcase /../binutils-gdb-current/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
ERROR: can't read "main_label": no such variable
ERROR: tcl error code TCL LOOKUP VARNAME main_label
ERROR: tcl error info:
can't read "main_label": no such variable
I was hoping to be able to verify that bar_label_5 and "$main_start + $main_len" are the same but no luck.
Anyway, any thoughts as to why this is failing on PowerPC? I assume it works fine on X86.
At the moment, I am a little puzzled as to what the right fix is.
Carl
On 4/8/24 05:04, Tom de Vries wrote:
> I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
> ...
> 00000000004102c4 <end_of_sequence>:
> 4102c4: 52800000 mov w0, #0x0 // #0
> 4102c8: 9100c3ff add sp, sp, #0x30
> 4102cc: d65f03c0 ret
> ...
> is not described by the line table:
> ...
> File name Line number Starting address View Stmt
> ...
> map-to-same-line.c 54 0x4102ac x
> map-to-same-line.c - 0x4102c4
> ...
>
> Fix this by ending the line table at $main_end.
>
> Likewise in a few other test-cases, found using:
> ...
> $ find gdb/testsuite/ -type f \
> | xargs grep -B1 DW_LNE_end_sequence \
> | grep set_address \
> | egrep -v "_end|_len"
> ...
>
> Tested on aarch64-linux.
> ---
> gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
> gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
> gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
> gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
> 10 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
> index 1880f4cb7fb..5d6e13a9ae0 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
> @@ -70,7 +70,7 @@ Dwarf::assemble $asm_file {
> line [line_for bar_label]
> DW_LNS_copy
>
> - DW_LNE_set_address bar_label_2
> + DW_LNE_set_address $bar_end
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
> index 6d12e968f41..1f30c5c3316 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
> @@ -146,7 +146,7 @@ proc do_test { start_label func_name tag } {
> DW_LNS_advance_line 1
> DW_LNS_copy
>
> - DW_LNE_set_address line_label_7
> + DW_LNE_set_address "$main_start + $main_len"
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
> index 6a5f7d6dd76..68f1fc83859 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
> @@ -134,7 +134,7 @@ Dwarf::assemble $asm_file {
> DW_LNS_advance_line 1
> DW_LNS_copy
>
> - DW_LNE_set_address line_label_7
> + DW_LNE_set_address "$main_start + $main_len"
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
> index b3db154db25..1b8d136e70e 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
> @@ -123,7 +123,7 @@ Dwarf::assemble $asm_file {
> DW_LNS_negate_stmt
> DW_LNS_copy
>
> - DW_LNE_set_address line_label_7
> + DW_LNE_set_address "$main_start + $main_len"
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
> index 603a616930a..c510de42037 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
> @@ -27,6 +27,9 @@ Dwarf::assemble $asm_file {
> declare_labels Llines
> global srcdir subdir srcfile
>
> + get_func_info bar1
> + get_func_info bar2
> +
> cu {} {
> compile_unit {
> {language @DW_LANG_C}
> @@ -69,7 +72,7 @@ Dwarf::assemble $asm_file {
> line 33
> DW_LNS_copy
>
> - DW_LNE_set_address bar1_label_5
> + DW_LNE_set_address $bar1_end
> DW_LNE_end_sequence
>
>
> @@ -91,7 +94,7 @@ Dwarf::assemble $asm_file {
> line 47
> DW_LNS_copy
>
> - DW_LNE_set_address bar2_label_5
> + DW_LNE_set_address $bar2_end
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> index 5fd6ae04d38..85d5e9c8afb 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
> line [line_for bar_label_4]
> DW_LNS_copy
>
> - DW_LNE_set_address bar_label_5
> + DW_LNE_set_address "$main_start + $main_len"
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
> index 671e3e634ac..5a0705fc613 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
> @@ -30,6 +30,8 @@ Dwarf::assemble $asm_file {
> set DW_LNE_lo_usr 0x80
> set DW_LNE_hi_usr 0xff
>
> + get_func_info main
> +
> cu {} {
> compile_unit {
> {language @DW_LANG_C}
> @@ -54,7 +56,7 @@ Dwarf::assemble $asm_file {
> DW_LNE_user 2 $DW_LNE_hi_usr
> DW_LNS_copy
>
> - DW_LNE_set_address main_label_2
> + DW_LNE_set_address $main_end
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl
> index 968378620a0..5817b2b0f53 100644
> --- a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl
> +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl
> @@ -110,7 +110,7 @@ Dwarf::assemble $asm_file {
> DW_LNS_negate_stmt
> DW_LNS_copy
>
> - DW_LNE_set_address line_label_7
> + DW_LNE_set_address "$func_start + $func_len"
> DW_LNE_end_sequence
> }
> }
> diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.c b/gdb/testsuite/gdb.reverse/map-to-same-line.c
> index 45e7ffb0f06..7185955f40a 100644
> --- a/gdb/testsuite/gdb.reverse/map-to-same-line.c
> +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.c
> @@ -53,6 +53,5 @@ main (void)
> asm ("main_return: .globl main_return");
> k = j; f3 = f2; str_3 = str_2; /* TAG: main return */
>
> - asm ("end_of_sequence: .globl end_of_sequence");
> return 0; /* TAG: main return */
> }
> diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.exp b/gdb/testsuite/gdb.reverse/map-to-same-line.exp
> index b556e7cb676..067fe012702 100644
> --- a/gdb/testsuite/gdb.reverse/map-to-same-line.exp
> +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.exp
> @@ -100,7 +100,8 @@ Dwarf::assemble $asm_file {
> DW_LNE_set_address main_return
> line [gdb_get_line_number "TAG: main return"]
> DW_LNS_copy
> - DW_LNE_set_address end_of_sequence
> +
> + DW_LNE_set_address $main_end
> DW_LNE_end_sequence
> }
> }
Tom:
I think I see the issue. bar_label_5 is a label in function bar. But "$main_start + $main_len" this
will give us an address in main, not bar. So, we need to set the address relative to the beginning of function bar?
Carl
On 4/24/24 10:45, Carl Love wrote:
> Tom:
>
> I am seeing a regression on Power 10 with this patch. Specifically the change to file dw2-lines.exp.
>
> --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
> line [line_for bar_label_4]
> DW_LNS_copy
>
> - DW_LNE_set_address bar_label_5
> + DW_LNE_set_address "$main_start + $main_len"
> DW_LNE_end_sequence
> }
> }
>
> The change results in the test failing on PowerPC.
>
> Running /home/carll/GDB/build-current/gdb/testsuite/../../../binutils-gdb-current/gdb/testsuite/gdb.dwarf2/dw2-lines.exp ...
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: continue to breakpoint: foo \(1\) (the program exited)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: next to foo (2) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: next to foo (3) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=32: next to foo (4) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: continue to breakpoint: foo \(1\) (the program exited)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: next to foo (2) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: next to foo (3) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=32: lv=2: ldw=64: next to foo (4) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: continue to breakpoint: foo \(1\) (the program exited)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: next to foo (2) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: next to foo (3) (the program is no longer running)
> FAIL: gdb.dwarf2/dw2-lines.exp: cv=2: cdw=64: lv=2: ldw=32: next to foo (4) (the program is no longer running)
> etc.
>
> If I edit the file and change the line back to bar_label_5 the test passes. I am only seeing an issue with the change to in this file. I specifically tested dw2-inline-header-2.exp and the change seems to work just fine there. I am really puzzled as to why it doesn't work in file dw2-lines.exp.
>
> I put the print statement in:
>
> puts "CARLL, main_start = $main_start, main_len = $main_len"
> DW_LNE_set_address "$main_start + $main_len"
>
> I get
>
> CARLL, main_start = main_label - 28, main_len = 76
>
> I tried printing main_label but it doesn't seem to be defined.
>
> ERROR: in testcase /../binutils-gdb-current/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> ERROR: can't read "main_label": no such variable
> ERROR: tcl error code TCL LOOKUP VARNAME main_label
> ERROR: tcl error info:
> can't read "main_label": no such variable
>
> I was hoping to be able to verify that bar_label_5 and "$main_start + $main_len" are the same but no luck.
> Anyway, any thoughts as to why this is failing on PowerPC? I assume it works fine on X86.
>
> At the moment, I am a little puzzled as to what the right fix is.
>
> Carl
>
> On 4/8/24 05:04, Tom de Vries wrote:
>> I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
>> ...
>> 00000000004102c4 <end_of_sequence>:
>> 4102c4: 52800000 mov w0, #0x0 // #0
>> 4102c8: 9100c3ff add sp, sp, #0x30
>> 4102cc: d65f03c0 ret
>> ...
>> is not described by the line table:
>> ...
>> File name Line number Starting address View Stmt
>> ...
>> map-to-same-line.c 54 0x4102ac x
>> map-to-same-line.c - 0x4102c4
>> ...
>>
>> Fix this by ending the line table at $main_end.
>>
>> Likewise in a few other test-cases, found using:
>> ...
>> $ find gdb/testsuite/ -type f \
>> | xargs grep -B1 DW_LNE_end_sequence \
>> | grep set_address \
>> | egrep -v "_end|_len"
>> ...
>>
>> Tested on aarch64-linux.
>> ---
>> gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
>> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
>> gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
>> gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
>> gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
>> 10 files changed, 16 insertions(+), 11 deletions(-)
>>
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
>> index 1880f4cb7fb..5d6e13a9ae0 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp
>> @@ -70,7 +70,7 @@ Dwarf::assemble $asm_file {
>> line [line_for bar_label]
>> DW_LNS_copy
>>
>> - DW_LNE_set_address bar_label_2
>> + DW_LNE_set_address $bar_end
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
>> index 6d12e968f41..1f30c5c3316 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp
>> @@ -146,7 +146,7 @@ proc do_test { start_label func_name tag } {
>> DW_LNS_advance_line 1
>> DW_LNS_copy
>>
>> - DW_LNE_set_address line_label_7
>> + DW_LNE_set_address "$main_start + $main_len"
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
>> index 6a5f7d6dd76..68f1fc83859 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp
>> @@ -134,7 +134,7 @@ Dwarf::assemble $asm_file {
>> DW_LNS_advance_line 1
>> DW_LNS_copy
>>
>> - DW_LNE_set_address line_label_7
>> + DW_LNE_set_address "$main_start + $main_len"
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
>> index b3db154db25..1b8d136e70e 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp
>> @@ -123,7 +123,7 @@ Dwarf::assemble $asm_file {
>> DW_LNS_negate_stmt
>> DW_LNS_copy
>>
>> - DW_LNE_set_address line_label_7
>> + DW_LNE_set_address "$main_start + $main_len"
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
>> index 603a616930a..c510de42037 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp
>> @@ -27,6 +27,9 @@ Dwarf::assemble $asm_file {
>> declare_labels Llines
>> global srcdir subdir srcfile
>>
>> + get_func_info bar1
>> + get_func_info bar2
>> +
>> cu {} {
>> compile_unit {
>> {language @DW_LANG_C}
>> @@ -69,7 +72,7 @@ Dwarf::assemble $asm_file {
>> line 33
>> DW_LNS_copy
>>
>> - DW_LNE_set_address bar1_label_5
>> + DW_LNE_set_address $bar1_end
>> DW_LNE_end_sequence
>>
>>
>> @@ -91,7 +94,7 @@ Dwarf::assemble $asm_file {
>> line 47
>> DW_LNS_copy
>>
>> - DW_LNE_set_address bar2_label_5
>> + DW_LNE_set_address $bar2_end
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>> index 5fd6ae04d38..85d5e9c8afb 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>> @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
>> line [line_for bar_label_4]
>> DW_LNS_copy
>>
>> - DW_LNE_set_address bar_label_5
>> + DW_LNE_set_address "$main_start + $main_len"
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
>> index 671e3e634ac..5a0705fc613 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp
>> @@ -30,6 +30,8 @@ Dwarf::assemble $asm_file {
>> set DW_LNE_lo_usr 0x80
>> set DW_LNE_hi_usr 0xff
>>
>> + get_func_info main
>> +
>> cu {} {
>> compile_unit {
>> {language @DW_LANG_C}
>> @@ -54,7 +56,7 @@ Dwarf::assemble $asm_file {
>> DW_LNE_user 2 $DW_LNE_hi_usr
>> DW_LNS_copy
>>
>> - DW_LNE_set_address main_label_2
>> + DW_LNE_set_address $main_end
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl
>> index 968378620a0..5817b2b0f53 100644
>> --- a/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl
>> +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl
>> @@ -110,7 +110,7 @@ Dwarf::assemble $asm_file {
>> DW_LNS_negate_stmt
>> DW_LNS_copy
>>
>> - DW_LNE_set_address line_label_7
>> + DW_LNE_set_address "$func_start + $func_len"
>> DW_LNE_end_sequence
>> }
>> }
>> diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.c b/gdb/testsuite/gdb.reverse/map-to-same-line.c
>> index 45e7ffb0f06..7185955f40a 100644
>> --- a/gdb/testsuite/gdb.reverse/map-to-same-line.c
>> +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.c
>> @@ -53,6 +53,5 @@ main (void)
>> asm ("main_return: .globl main_return");
>> k = j; f3 = f2; str_3 = str_2; /* TAG: main return */
>>
>> - asm ("end_of_sequence: .globl end_of_sequence");
>> return 0; /* TAG: main return */
>> }
>> diff --git a/gdb/testsuite/gdb.reverse/map-to-same-line.exp b/gdb/testsuite/gdb.reverse/map-to-same-line.exp
>> index b556e7cb676..067fe012702 100644
>> --- a/gdb/testsuite/gdb.reverse/map-to-same-line.exp
>> +++ b/gdb/testsuite/gdb.reverse/map-to-same-line.exp
>> @@ -100,7 +100,8 @@ Dwarf::assemble $asm_file {
>> DW_LNE_set_address main_return
>> line [gdb_get_line_number "TAG: main return"]
>> DW_LNS_copy
>> - DW_LNE_set_address end_of_sequence
>> +
>> + DW_LNE_set_address $main_end
>> DW_LNE_end_sequence
>> }
>> }
Tom:
The following patch fixes the issue for me on PowerPC. Please let me know if it looks ok and if the patch works on your systems as well. Thanks.
Carl
----------------------------------------------------------------------
Fix end_sequence addresses for dw2-lines.exp
The patch:
From f0d556d14b1d1c3f8e2f9c13b08adca22e1b8c9c Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Wed, 17 Apr 2024 12:55:00 +0200
Subject: [PATCH] [gdb/testsuite] Fix end_sequence addresses
I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
...
00000000004102c4 <end_of_sequence>:
4102c4: 52800000 mov w0, #0x0 // #0
4102c8: 9100c3ff add sp, sp, #0x30
4102cc: d65f03c0 ret
...
is not described by the line table:
...
File name Line number Starting address View Stmt
...
map-to-same-line.c 54 0x4102ac x
map-to-same-line.c - 0x4102c4
...
Fix this by ending the line table at $main_end.
Likewise in a few other test-cases, found using:
...
$ find gdb/testsuite/ -type f \
| xargs grep -B1 DW_LNE_end_sequence \
| grep set_address \
| egrep -v "_end|_len"
...
Tested on aarch64-linux.
---
gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
10 files changed, 16 insertions(+), 11 deletions(-)
The issue in file dw2-lines.exp is the change
- DW_LNE_set_address bar_label_5
+ DW_LNE_set_address "$main_start + $main_len"
The label bar_label_5 is in function bar, not function main. The new
set address should have been $bar_start + $bar_len.
---
gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
index 85d5e9c8afb..af5b6b71768 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
@@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
line [line_for bar_label_4]
DW_LNS_copy
- DW_LNE_set_address "$main_start + $main_len"
+ DW_LNE_set_address "$bar_start + $bar_len"
DW_LNE_end_sequence
}
}
On 4/24/24 20:28, Carl Love wrote:
>
> Tom:
>
> The following patch fixes the issue for me on PowerPC. Please let me know if it looks ok and if the patch works on your systems as well. Thanks.
>
> Carl
Hi Carl,
I don't see the FAILs you mentioned, but your patch is correct, and
doesn't regress the test-case for me on x86_64-linux.
Thanks for finding, reporting and fixing this.
So, approved, but consider making the commit message shorter.
Including the entire commit message of the patch you're fixing is a bit
of an overkill.
Approved-By: Tom de Vries <tdevries@suse.de>
Thanks,
- Tom
>
> ----------------------------------------------------------------------
>
> Fix end_sequence addresses for dw2-lines.exp
>
> The patch:
>
> From f0d556d14b1d1c3f8e2f9c13b08adca22e1b8c9c Mon Sep 17 00:00:00 2001
> From: Tom de Vries <tdevries@suse.de>
> Date: Wed, 17 Apr 2024 12:55:00 +0200
> Subject: [PATCH] [gdb/testsuite] Fix end_sequence addresses
>
> I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
> ...
> 00000000004102c4 <end_of_sequence>:
> 4102c4: 52800000 mov w0, #0x0 // #0
> 4102c8: 9100c3ff add sp, sp, #0x30
> 4102cc: d65f03c0 ret
> ...
> is not described by the line table:
> ...
> File name Line number Starting address View Stmt
> ...
> map-to-same-line.c 54 0x4102ac x
> map-to-same-line.c - 0x4102c4
> ...
>
> Fix this by ending the line table at $main_end.
>
> Likewise in a few other test-cases, found using:
> ...
> $ find gdb/testsuite/ -type f \
> | xargs grep -B1 DW_LNE_end_sequence \
> | grep set_address \
> | egrep -v "_end|_len"
> ...
>
> Tested on aarch64-linux.
> ---
> gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
> gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
> gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
> gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
> gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
> 10 files changed, 16 insertions(+), 11 deletions(-)
>
> The issue in file dw2-lines.exp is the change
>
>
> - DW_LNE_set_address bar_label_5
> + DW_LNE_set_address "$main_start + $main_len"
>
> The label bar_label_5 is in function bar, not function main. The new
> set address should have been $bar_start + $bar_len.
> ---
> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> index 85d5e9c8afb..af5b6b71768 100644
> --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
> @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
> line [line_for bar_label_4]
> DW_LNS_copy
>
> - DW_LNE_set_address "$main_start + $main_len"
> + DW_LNE_set_address "$bar_start + $bar_len"
> DW_LNE_end_sequence
> }
> }
Tom:
Thanks for verifying the patch on X86. I agree, including the entire commit message from your patch
is a little overkill. I cut down your commit message and made the description of my fix a little better.
Here is what I now have for the commit message:
------------------------------------------------------
Fix end_sequence addresses for dw2-lines.exp
The patch:
From f0d556d14b1d1c3f8e2f9c13b08adca22e1b8c9c Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Wed, 17 Apr 2024 12:55:00 +0200
Subject: [PATCH] [gdb/testsuite] Fix end_sequence addresses
I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
...
00000000004102c4 <end_of_sequence>:
4102c4: 52800000 mov w0, #0x0 // #0
4102c8: 9100c3ff add sp, sp, #0x30
4102cc: d65f03c0 ret
...
is not described by the line table:
...
<snip>
The regression failure on PowerPC is due to the change in file
dw2-lines.exp,
- DW_LNE_set_address bar_label_5
+ DW_LNE_set_address "$main_start + $main_len"
The label bar_label_5 is in function bar, not function main. The new
set address should have been $bar_start + $bar_len.
--------------------------------------------------------
Please let me know if that looks reasonable and I will then commit the fix. Thanks!
Carl
On 4/24/24 14:07, Tom de Vries wrote:
> On 4/24/24 20:28, Carl Love wrote:
>>
>> Tom:
>>
>> The following patch fixes the issue for me on PowerPC. Please let me know if it looks ok and if the patch works on your systems as well. Thanks.
>>
>> Carl
>
> Hi Carl,
>
> I don't see the FAILs you mentioned, but your patch is correct, and doesn't regress the test-case for me on x86_64-linux.
>
> Thanks for finding, reporting and fixing this.
>
> So, approved, but consider making the commit message shorter. Including the entire commit message of the patch you're fixing is a bit of an overkill.
>
> Approved-By: Tom de Vries <tdevries@suse.de>
>
> Thanks,
> - Tom
>
>>
>> ----------------------------------------------------------------------
>>
>> Fix end_sequence addresses for dw2-lines.exp
>>
>> The patch:
>>
>> From f0d556d14b1d1c3f8e2f9c13b08adca22e1b8c9c Mon Sep 17 00:00:00 2001
>> From: Tom de Vries <tdevries@suse.de>
>> Date: Wed, 17 Apr 2024 12:55:00 +0200
>> Subject: [PATCH] [gdb/testsuite] Fix end_sequence addresses
>>
>> I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
>> ...
>> 00000000004102c4 <end_of_sequence>:
>> 4102c4: 52800000 mov w0, #0x0 // #0
>> 4102c8: 9100c3ff add sp, sp, #0x30
>> 4102cc: d65f03c0 ret
>> ...
>> is not described by the line table:
>> ...
>> File name Line number Starting address View Stmt
>> ...
>> map-to-same-line.c 54 0x4102ac x
>> map-to-same-line.c - 0x4102c4
>> ...
>>
>> Fix this by ending the line table at $main_end.
>>
>> Likewise in a few other test-cases, found using:
>> ...
>> $ find gdb/testsuite/ -type f \
>> | xargs grep -B1 DW_LNE_end_sequence \
>> | grep set_address \
>> | egrep -v "_end|_len"
>> ...
>>
>> Tested on aarch64-linux.
>> ---
>> gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
>> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
>> gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
>> gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
>> gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
>> gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
>> 10 files changed, 16 insertions(+), 11 deletions(-)
>>
>> The issue in file dw2-lines.exp is the change
>>
>>
>> - DW_LNE_set_address bar_label_5
>> + DW_LNE_set_address "$main_start + $main_len"
>>
>> The label bar_label_5 is in function bar, not function main. The new
>> set address should have been $bar_start + $bar_len.
>> ---
>> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>> index 85d5e9c8afb..af5b6b71768 100644
>> --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>> @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
>> line [line_for bar_label_4]
>> DW_LNS_copy
>> - DW_LNE_set_address "$main_start + $main_len"
>> + DW_LNE_set_address "$bar_start + $bar_len"
>> DW_LNE_end_sequence
>> }
>> }
>
On 4/25/24 19:05, Carl Love wrote:
> Tom:
>
> Thanks for verifying the patch on X86. I agree, including the entire commit message from your patch
> is a little overkill. I cut down your commit message and made the description of my fix a little better.
> Here is what I now have for the commit message:
>
> ------------------------------------------------------
> Fix end_sequence addresses for dw2-lines.exp
>
> The patch:
>
> From f0d556d14b1d1c3f8e2f9c13b08adca22e1b8c9c Mon Sep 17 00:00:00 2001
> From: Tom de Vries <tdevries@suse.de>
> Date: Wed, 17 Apr 2024 12:55:00 +0200
> Subject: [PATCH] [gdb/testsuite] Fix end_sequence addresses
>
> I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
> ...
> 00000000004102c4 <end_of_sequence>:
> 4102c4: 52800000 mov w0, #0x0 // #0
> 4102c8: 9100c3ff add sp, sp, #0x30
> 4102cc: d65f03c0 ret
> ...
> is not described by the line table:
> ...
>
> <snip>
>
>
> The regression failure on PowerPC is due to the change in file
> dw2-lines.exp,
>
> - DW_LNE_set_address bar_label_5
> + DW_LNE_set_address "$main_start + $main_len"
>
> The label bar_label_5 is in function bar, not function main. The new
> set address should have been $bar_start + $bar_len.
>
> --------------------------------------------------------
>
> Please let me know if that looks reasonable and I will then commit the fix. Thanks!
Hi Carl,
yes, this is fine, thanks.
- Tom
>
> Carl
>
>
> On 4/24/24 14:07, Tom de Vries wrote:
>> On 4/24/24 20:28, Carl Love wrote:
>>>
>>> Tom:
>>>
>>> The following patch fixes the issue for me on PowerPC. Please let me know if it looks ok and if the patch works on your systems as well. Thanks.
>>>
>>> Carl
>>
>> Hi Carl,
>>
>> I don't see the FAILs you mentioned, but your patch is correct, and doesn't regress the test-case for me on x86_64-linux.
>>
>> Thanks for finding, reporting and fixing this.
>>
>> So, approved, but consider making the commit message shorter. Including the entire commit message of the patch you're fixing is a bit of an overkill.
>>
>> Approved-By: Tom de Vries <tdevries@suse.de>
>>
>> Thanks,
>> - Tom
>>
>>>
>>> ----------------------------------------------------------------------
>>>
>>> Fix end_sequence addresses for dw2-lines.exp
>>>
>>> The patch:
>>>
>>> From f0d556d14b1d1c3f8e2f9c13b08adca22e1b8c9c Mon Sep 17 00:00:00 2001
>>> From: Tom de Vries <tdevries@suse.de>
>>> Date: Wed, 17 Apr 2024 12:55:00 +0200
>>> Subject: [PATCH] [gdb/testsuite] Fix end_sequence addresses
>>>
>>> I noticed in test-case gdb.reverse/map-to-same-line.exp, that the end of main:
>>> ...
>>> 00000000004102c4 <end_of_sequence>:
>>> 4102c4: 52800000 mov w0, #0x0 // #0
>>> 4102c8: 9100c3ff add sp, sp, #0x30
>>> 4102cc: d65f03c0 ret
>>> ...
>>> is not described by the line table:
>>> ...
>>> File name Line number Starting address View Stmt
>>> ...
>>> map-to-same-line.c 54 0x4102ac x
>>> map-to-same-line.c - 0x4102c4
>>> ...
>>>
>>> Fix this by ending the line table at $main_end.
>>>
>>> Likewise in a few other test-cases, found using:
>>> ...
>>> $ find gdb/testsuite/ -type f \
>>> | xargs grep -B1 DW_LNE_end_sequence \
>>> | grep set_address \
>>> | egrep -v "_end|_len"
>>> ...
>>>
>>> Tested on aarch64-linux.
>>> ---
>>> gdb/testsuite/gdb.dwarf2/dw2-gas-workaround.exp | 2 +-
>>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-1.exp | 2 +-
>>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-2.exp | 2 +-
>>> gdb/testsuite/gdb.dwarf2/dw2-inline-header-3.exp | 2 +-
>>> gdb/testsuite/gdb.dwarf2/dw2-line-number-zero.exp | 7 +++++--
>>> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
>>> gdb/testsuite/gdb.dwarf2/dw2-vendor-extended-opcode.exp | 4 +++-
>>> gdb/testsuite/gdb.dwarf2/imported-unit-bp.exp.tcl | 2 +-
>>> gdb/testsuite/gdb.reverse/map-to-same-line.c | 1 -
>>> gdb/testsuite/gdb.reverse/map-to-same-line.exp | 3 ++-
>>> 10 files changed, 16 insertions(+), 11 deletions(-)
>>>
>>> The issue in file dw2-lines.exp is the change
>>>
>>>
>>> - DW_LNE_set_address bar_label_5
>>> + DW_LNE_set_address "$main_start + $main_len"
>>>
>>> The label bar_label_5 is in function bar, not function main. The new
>>> set address should have been $bar_start + $bar_len.
>>> ---
>>> gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>>> index 85d5e9c8afb..af5b6b71768 100644
>>> --- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>>> +++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
>>> @@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
>>> line [line_for bar_label_4]
>>> DW_LNS_copy
>>> - DW_LNE_set_address "$main_start + $main_len"
>>> + DW_LNE_set_address "$bar_start + $bar_len"
>>> DW_LNE_end_sequence
>>> }
>>> }
>>
@@ -70,7 +70,7 @@ Dwarf::assemble $asm_file {
line [line_for bar_label]
DW_LNS_copy
- DW_LNE_set_address bar_label_2
+ DW_LNE_set_address $bar_end
DW_LNE_end_sequence
}
}
@@ -146,7 +146,7 @@ proc do_test { start_label func_name tag } {
DW_LNS_advance_line 1
DW_LNS_copy
- DW_LNE_set_address line_label_7
+ DW_LNE_set_address "$main_start + $main_len"
DW_LNE_end_sequence
}
}
@@ -134,7 +134,7 @@ Dwarf::assemble $asm_file {
DW_LNS_advance_line 1
DW_LNS_copy
- DW_LNE_set_address line_label_7
+ DW_LNE_set_address "$main_start + $main_len"
DW_LNE_end_sequence
}
}
@@ -123,7 +123,7 @@ Dwarf::assemble $asm_file {
DW_LNS_negate_stmt
DW_LNS_copy
- DW_LNE_set_address line_label_7
+ DW_LNE_set_address "$main_start + $main_len"
DW_LNE_end_sequence
}
}
@@ -27,6 +27,9 @@ Dwarf::assemble $asm_file {
declare_labels Llines
global srcdir subdir srcfile
+ get_func_info bar1
+ get_func_info bar2
+
cu {} {
compile_unit {
{language @DW_LANG_C}
@@ -69,7 +72,7 @@ Dwarf::assemble $asm_file {
line 33
DW_LNS_copy
- DW_LNE_set_address bar1_label_5
+ DW_LNE_set_address $bar1_end
DW_LNE_end_sequence
@@ -91,7 +94,7 @@ Dwarf::assemble $asm_file {
line 47
DW_LNS_copy
- DW_LNE_set_address bar2_label_5
+ DW_LNE_set_address $bar2_end
DW_LNE_end_sequence
}
}
@@ -104,7 +104,7 @@ proc test_1 { _cv _cdw64 _lv _ldw64 {_string_form ""}} {
line [line_for bar_label_4]
DW_LNS_copy
- DW_LNE_set_address bar_label_5
+ DW_LNE_set_address "$main_start + $main_len"
DW_LNE_end_sequence
}
}
@@ -30,6 +30,8 @@ Dwarf::assemble $asm_file {
set DW_LNE_lo_usr 0x80
set DW_LNE_hi_usr 0xff
+ get_func_info main
+
cu {} {
compile_unit {
{language @DW_LANG_C}
@@ -54,7 +56,7 @@ Dwarf::assemble $asm_file {
DW_LNE_user 2 $DW_LNE_hi_usr
DW_LNS_copy
- DW_LNE_set_address main_label_2
+ DW_LNE_set_address $main_end
DW_LNE_end_sequence
}
}
@@ -110,7 +110,7 @@ Dwarf::assemble $asm_file {
DW_LNS_negate_stmt
DW_LNS_copy
- DW_LNE_set_address line_label_7
+ DW_LNE_set_address "$func_start + $func_len"
DW_LNE_end_sequence
}
}
@@ -53,6 +53,5 @@ main (void)
asm ("main_return: .globl main_return");
k = j; f3 = f2; str_3 = str_2; /* TAG: main return */
- asm ("end_of_sequence: .globl end_of_sequence");
return 0; /* TAG: main return */
}
@@ -100,7 +100,8 @@ Dwarf::assemble $asm_file {
DW_LNE_set_address main_return
line [gdb_get_line_number "TAG: main return"]
DW_LNS_copy
- DW_LNE_set_address end_of_sequence
+
+ DW_LNE_set_address $main_end
DW_LNE_end_sequence
}
}