@@ -1,3 +1,12 @@
+2019-11-28 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * dwarf2read.c (lnp_state_machine::record_line): Include
+ end_sequence parameter in debug print out. Record the line if we
+ are at an end_sequence marker even if it's not the start of a
+ statement.
+ * symmisc.c (maintenance_print_one_line_table): Print end of
+ sequence markers with 'END' not '0'.
+
2019-11-27 Christian Biesinger <cbiesinger@google.com>
* NEWS: Mention the new multithreaded symbol loading.
@@ -21084,10 +21084,11 @@
{
fprintf_unfiltered (gdb_stdlog,
"Processing actual line %u: file %u,"
- " address %s, is_stmt %u, discrim %u\n",
+ " address %s, is_stmt %u, discrim %u%s\n",
m_line, m_file,
paddress (m_gdbarch, m_address),
- m_is_stmt, m_discriminator);
+ m_is_stmt, m_discriminator,
+ (end_sequence ? "\t(end sequence)" : ""));
}
file_entry *fe = current_file ();
@@ -21100,7 +21101,8 @@
else if (m_op_index == 0 || end_sequence)
{
fe->included_p = 1;
- if (m_record_lines_p && (producer_is_codewarrior (m_cu) || m_is_stmt))
+ if (m_record_lines_p
+ && (producer_is_codewarrior (m_cu) || m_is_stmt || end_sequence))
{
if (m_last_subfile != m_cu->get_builder ()->get_current_subfile ()
|| end_sequence)
@@ -1000,8 +1000,12 @@
struct linetable_entry *item;
item = &linetable->item [i];
- printf_filtered (_("%-6d %6d %s\n"), i, item->line,
- core_addr_to_string (item->pc));
+ printf_filtered ("%-6d ", i);
+ if (item->line > 0)
+ printf_filtered ("%6d ", item->line);
+ else
+ printf_filtered ("%6s ", _("END"));
+ printf_filtered ("%s\n", core_addr_to_string (item->pc));
}
}
@@ -1,5 +1,10 @@
2019-11-28 Andrew Burgess <andrew.burgess@embecosm.com>
+ * gdb.base/maint.exp: Update line table parsing test.
+ * gdb.dwarf2/dw2-ranges-base.exp: Add new line table parsing test.
+
+2019-11-28 Andrew Burgess <andrew.burgess@embecosm.com>
+
* lib/gdb.exp (skip_btrace_tests): Return 1 if the test fails to
compile.
(skip_btrace_pt_tests): Likewise.
@@ -508,8 +508,8 @@
# Test that "main info line-table" w/o a file name shows the symtab for
# $srcfile.
set saw_srcfile 0
-set test "maint info line-table w/o a file name"
-gdb_test_multiple "maint info line-table" $test {
+gdb_test_multiple "maint info line-table" \
+ "maint info line-table w/o a file name" {
-re "symtab: \[^\n\r\]+${srcfile} \\(\\(struct symtab \\*\\) $hex\\)\r\nlinetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS" {
set saw_srcfile 1
exp_continue
@@ -518,7 +518,11 @@
# Match each symtab to avoid overflowing expect's buffer.
exp_continue
}
- -re "$decimal\[ \t\]+$decimal\[ \t\]+$hex\r\n" {
+ -re "symtab: \[^\n\r\]+ \\(\\(struct symtab \\*\\) $hex\\)\r\nlinetable: \\(\\(struct linetable \\*\\) 0x0\\):\r\nNo line table.\r\n" {
+ # For symtabs with no linetable.
+ exp_continue
+ }
+ -re "^$decimal\[ \t\]+$decimal\[ \t\]+$hex\r\n" {
# Line table entries can be long too:
#
# INDEX LINE ADDRESS
@@ -531,13 +535,17 @@
# 6 45 0x0000000000400740
# (...)
# 454 129 0x00007ffff7df1d28
- # 455 0 0x00007ffff7df1d3f
+ # 455 END 0x00007ffff7df1d3f
#
# Match each line to avoid overflowing expect's buffer.
exp_continue
}
- -re "$gdb_prompt $" {
- gdb_assert $saw_srcfile $test
+ -re "^$decimal\[ \t\]+END\[ \t\]+$hex\r\n" {
+ # Matches an end marker in the above.
+ exp_continue
+ }
+ -re "^$gdb_prompt $" {
+ gdb_assert $saw_srcfile $gdb_test_name
}
}
@@ -141,3 +141,25 @@
"Line 21 of .* starts at address .* and ends at .*"
gdb_test "info line frame3" \
"Line 31 of .* starts at address .* and ends at .*"
+
+# Ensure that the line table correctly tracks the end of sequence markers.
+set end_seq_count 0
+gdb_test_multiple "maint info line-table" \
+ "count END markers in line table" {
+ -re "^$decimal\[ \t\]+$decimal\[ \t\]+$hex\r\n" {
+ exp_continue
+ }
+ -re "^$decimal\[ \t\]+END\[ \t\]+$hex\r\n" {
+ incr end_seq_count
+ exp_continue
+ }
+ -re "^$gdb_prompt $" {
+ gdb_assert [expr $end_seq_count == 3] $gdb_test_name
+ }
+ -re ".*linetable: \\(\\(struct linetable \\*\\) 0x0\\):\r\nNo line table.\r\n" {
+ exp_continue
+ }
+ -re ".*linetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS\r\n" {
+ exp_continue
+ }
+ }
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/525 ...................................................................... gdb: Include end of sequence markers in the line table In this commit: commit d9b3de22f33e400f7f409cce3acf6c7dab07dd79 Date: Wed May 27 14:44:29 2015 -0700 Add struct to record dwarf line number state machine. I believe an unintended change was made to how we store the DWARF line table, the end of sequence markers between sequences of lines were lost from the line table. This commit fixes this small oversight and restores the end of sequence markers. Given that we've survived this long without noticing is clearly an indication that this isn't that serious, however, a later patch that I am developing would benefit from having the markers in place, so I'd like to restore them. Having the markers also means that the output of 'maintenance info line-table' now more closely reflects the DWARF line table. I've taken this opportunity to improve how 'maintenance info line-table' displays the end of sequence markers - it now uses the END keyword, rather than just printing an entry with line number 0. So we see this: INDEX LINE ADDRESS 0 12 0x00000000004003b0 1 17 0x00000000004003b0 2 18 0x00000000004003b0 3 END 0x00000000004003b7 4 5 0x00000000004004a0 5 6 0x00000000004004a0 6 END 0x00000000004004a7 Instead of what we would have seen, which was this: INDEX LINE ADDRESS 0 12 0x00000000004003b0 1 17 0x00000000004003b0 2 18 0x00000000004003b0 3 0 0x00000000004003b7 4 5 0x00000000004004a0 5 6 0x00000000004004a0 6 0 0x00000000004004a7 I've added a small test that uses 'maintenance info line-table' to ensure that we don't regress this again. gdb/ChangeLog: * dwarf2read.c (lnp_state_machine::record_line): Include end_sequence parameter in debug print out. Record the line if we are at an end_sequence marker even if it's not the start of a statement. * symmisc.c (maintenance_print_one_line_table): Print end of sequence markers with 'END' not '0'. gdb/testsuite/ChangeLog: * gdb.base/maint.exp: Update line table parsing test. * gdb.dwarf2/dw2-ranges-base.exp: Add new line table parsing test. Change-Id: I002f872248db82a1d4fefdc6b51ff5dbf932d8a8 --- M gdb/ChangeLog M gdb/dwarf2read.c M gdb/symmisc.c M gdb/testsuite/ChangeLog M gdb/testsuite/gdb.base/maint.exp M gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp 6 files changed, 61 insertions(+), 11 deletions(-) -- Gerrit-Project: binutils-gdb Gerrit-Branch: master Gerrit-Change-Id: I002f872248db82a1d4fefdc6b51ff5dbf932d8a8 Gerrit-Change-Number: 525 Gerrit-PatchSet: 4 Gerrit-Owner: Andrew Burgess <andrew.burgess@embecosm.com> Gerrit-MessageType: newpatchset