[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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d0c712d4fd87201550d4063ee7a8039eba008960..0659c246f34d3f6cd9f8a54d8c2c275d110a7023 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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

diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp
index 1a0cbf689e6a13c2a0ab12dc39d93c9528a22b8a..c585621ac48a5ebee382dc837c5c47468d8783b4 100644 (file)
--- a/gdb/testsuite/lib/dwarf.exp
+++ b/gdb/testsuite/lib/dwarf.exp
@@ -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