[gdb/testsuite] Fix .debug_abbrev terminators

The abbreviations table for a single compilation unit has two types of
terminators:
- a ".byte 0" pair denoting the end of an attribute list
- a single ".byte 0" denoting the end of the table

However, at the end of the .debug_abbrev section in dw2-line-number-zero-dw.S,
we have four ".byte 0" entries:
...
        .uleb128        0x12            /* DW_AT_high_pc */
        .uleb128        0x01            /* DW_FORM_addr */
        .byte        0x0                /* Terminator */
        .byte        0x0                /* Terminator */
        .byte        0x0                /* Terminator */
        .byte        0x0                /* Terminator */
...

The first two are the attribute list terminator, the third is the end-of-table
terminator, and the last is superfluous/incorrect.

Fix this by emitting instead:
...
        .uleb128        0x12            /* DW_AT_high_pc */
        .uleb128        0x01            /* DW_FORM_addr */
        .byte        0x0                /* DW_AT - Terminator */
        .byte        0x0                /* DW_FORM - Terminator */
        .byte        0x0                /* Abbrev end - Terminator */
...
where the last comment resembles the comment for other abbreviation codes:
...
        .section .debug_abbrev
.Labbrev1_begin:
        .uleb128        2               /* Abbrev start */
...

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2020-11-03  Tom de Vries  <tdevries@suse.de>

	* lib/dwarf.exp (Dwarf::_handle_DW_TAG): Improve attribute list
	terminator comments.
	(Dwarf::cu, Dwarf::tu): Remove superfluous abbreviation table
	terminator.
This commit is contained in:
Tom de Vries
2020-11-03 17:41:11 +01:00
parent f3016d6ce1
commit c40907bfe0
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,10 @@
2020-11-03 Tom de Vries <tdevries@suse.de>
* lib/dwarf.exp (Dwarf::_handle_DW_TAG): Improve attribute list
terminator comments.
(Dwarf::cu, Dwarf::tu): Remove superfluous abbreviation table
terminator.
2020-11-02 Simon Marchi <simon.marchi@polymtl.ca>
* gdb.base/step-over-no-symbols.exp (test_step_over): Replace

View File

@ -723,8 +723,8 @@ namespace eval Dwarf {
_defer_output $_abbrev_section {
# Terminator.
_op .byte 0x0 Terminator
_op .byte 0x0 Terminator
_op .byte 0x0 "DW_AT - Terminator"
_op .byte 0x0 "DW_FORM - Terminator"
}
if {$has_children} {
@ -1111,8 +1111,7 @@ namespace eval Dwarf {
_defer_output $_abbrev_section {
# Emit the terminator.
_op .byte 0x0 Terminator
_op .byte 0x0 Terminator
_op .byte 0x0 "Abbrev end - Terminator"
}
define_label $end_label
@ -1220,8 +1219,7 @@ namespace eval Dwarf {
_defer_output $_abbrev_section {
# Emit the terminator.
_op .byte 0x0 Terminator
_op .byte 0x0 Terminator
_op .byte 0x0 "Abbrev end - Terminator"
}
define_label $end_label