diff options
| -rw-r--r-- | gdb/symmisc.c | 9 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 54dc570..a09b541 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -976,10 +976,11 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data) /* Leave space for 6 digits of index and line number. After that the tables will just not format as well. */ struct ui_out *uiout = current_uiout; - ui_out_emit_table table_emitter (uiout, 5, -1, "line-table"); + ui_out_emit_table table_emitter (uiout, 6, -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 (18, ui_left, "rel-address", _("REL-ADDRESS")); + uiout->table_header (18, ui_left, "unrel-address", _("UNREL-ADDRESS")); uiout->table_header (7, ui_left, "is-stmt", _("IS-STMT")); uiout->table_header (12, ui_left, "prologue-end", _("PROLOGUE-END")); uiout->table_body (); @@ -995,7 +996,9 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data) uiout->field_signed ("line", item->line); else uiout->field_string ("line", _("END")); - uiout->field_core_addr ("address", objfile->arch (), + uiout->field_core_addr ("rel-address", objfile->arch (), + item->pc (objfile)); + uiout->field_core_addr ("unrel-address", objfile->arch (), CORE_ADDR (item->raw_pc ())); uiout->field_string ("is-stmt", item->is_stmt ? "Y" : ""); uiout->field_string ("prologue-end", item->prologue_end ? "Y" : ""); diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 0a0ae69..6c2d7e1 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8872,7 +8872,7 @@ proc is_stmt_addresses { file } { set is_stmt [list] gdb_test_multiple "maint info line-table $file" "" { - -re "\r\n$decimal\[ \t\]+$decimal\[ \t\]+($hex)\[ \t\]+Y\[^\r\n\]*" { + -re "\r\n$decimal\[ \t\]+$decimal\[ \t\]+($hex)\[ \t\]+$hex\[ \t\]+Y\[^\r\n\]*" { lappend is_stmt $expect_out(1,string) exp_continue } |