diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/symmisc.c | 29 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp | 6 |
4 files changed, 28 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3a16003..f1b007b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 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 to value-based API. (print_field_values): Likewise. diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 4bf1f08..3df526b 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -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")); - - for (i = 0; i < linetable->nitems; ++i) + 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 (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"); } } diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 40adbfb..e7613f0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 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. * gdb.ada/sub_variant.exp: New file. diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp index c1a3ab1..92f8f6c 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ranges-base.exp @@ -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 } } |