OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix column alignment in "maint info line-table" 

Andrew Burgess pointed out on irc that "maint info line-table" doesn't
properly align the table headers.  This patch fixes the problem by
switching the table to use ui-out.

This required a small tweak to one test case, as ui-out will pad a
field using spaces, even at the end of a line.

gdb/ChangeLog
2020-03-20  Tom Tromey  <tromey@adacore.com>

	* symmisc.c (maintenance_print_one_line_table): Use ui_out.

gdb/testsuite/ChangeLog
2020-03-20  Tom Tromey  <tromey@adacore.com>

	* gdb.dwarf2/dw2-ranges-base.exp: Update regular expressions.
This commit is contained in:
Tom Tromey 2020-03-20 07:15:08 -06:00
parent 70304be939
commit 1773be9ea2
4 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2020-03-20 Tom Tromey <tromey@adacore.com>
* symmisc.c (maintenance_print_one_line_table): Use ui_out.
2020-03-20 Tom Tromey <tromey@adacore.com>
* ada-valprint.c (print_variant_part): Remove parameters; switch

27
gdb/symmisc.c
View File

@ -985,26 +985,31 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data)
printf_filtered (_("Line table has no lines.\n"));
else
{
int i;
/* Leave space for 6 digits of index and line number. After that the
tables will just not format as well. */
printf_filtered (_("%-6s %6s %s %s\n"),
_("INDEX"), _("LINE"), _("ADDRESS"), _("IS-STMT"));
struct ui_out *uiout = current_uiout;
ui_out_emit_table table_emitter (uiout, 4, -1, "line-table");
uiout->table_header (6, ui_left, "index", _("INDEX"));
uiout->table_header (6, ui_left, "line", _("LINE"));
uiout->table_header (18, ui_left, "address", _("ADDRESS"));
uiout->table_header (1, ui_left, "is-stmt", _("IS-STMT"));
uiout->table_body ();
for (i = 0; i < linetable->nitems; ++i)
for (int i = 0; i < linetable->nitems; ++i)
{
struct linetable_entry *item;
item = &linetable->item [i];
printf_filtered ("%-6d ", i);
ui_out_emit_tuple tuple_emitter (uiout, nullptr);
uiout->field_signed ("index", i);
if (item->line > 0)
printf_filtered ("%6d ", item->line);
uiout->field_signed ("line", item->line);
else
printf_filtered ("%6s ", _("END"));
printf_filtered ("%s%s\n",
core_addr_to_string (item->pc),
(item->is_stmt ? " Y" : ""));
uiout->field_string ("line", _("END"));
uiout->field_core_addr ("address", get_objfile_arch (objfile),
item->pc);
uiout->field_string ("is-stmt", item->is_stmt ? "Y" : "");
uiout->text ("\n");
}
}

4
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2020-03-20 Tom Tromey <tromey@adacore.com>
* gdb.dwarf2/dw2-ranges-base.exp: Update regular expressions.
2020-03-20 Tom Tromey <tromey@adacore.com>
* gdb.ada/sub_variant/subv.adb: New file.

6
gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp
View File

@ -146,10 +146,10 @@ gdb_test "info line frame3" \
set end_seq_count 0
gdb_test_multiple "maint info line-table gdb.dwarf2/dw2-ranges-base.c" \
"count END markers in line table" {
-re "^$decimal\[ \t\]+$decimal\[ \t\]+$hex\(\[ \t\]+Y\)?\r\n" {
-re "^$decimal\[ \t\]+$decimal\[ \t\]+$hex\(\[ \t\]+Y\)? *\r\n" {
exp_continue
}
-re "^$decimal\[ \t\]+END\[ \t\]+$hex\(\[ \t\]+Y\)?\r\n" {
-re "^$decimal\[ \t\]+END\[ \t\]+$hex\(\[ \t\]+Y\)? *\r\n" {
incr end_seq_count
exp_continue
}
@ -159,7 +159,7 @@ gdb_test_multiple "maint info line-table gdb.dwarf2/dw2-ranges-base.c" \
-re ".*linetable: \\(\\(struct linetable \\*\\) 0x0\\):\r\nNo line table.\r\n" {
exp_continue
}
-re ".*linetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS\[ \t\]+IS-STMT\r\n" {
-re ".*linetable: \\(\\(struct linetable \\*\\) $hex\\):\r\nINDEX\[ \t\]+LINE\[ \t\]+ADDRESS\[ \t\]+IS-STMT *\r\n" {
exp_continue
}
}