diff options
| author | Doug Evans <xdje42@gmail.com> | 2014-11-15 10:08:34 -0800 |
|---|---|---|
| committer | Doug Evans <xdje42@gmail.com> | 2014-11-15 10:08:34 -0800 |
| commit | 34248c3af73049fe1f8b7a4b9eb7ae09f42eed95 (patch) | |
| tree | 4ee18ab40e0acfad0e4524ba74c58005394b8752 /gdb/tui/tui-winsource.c | |
| parent | 2097ae2584c1018a7a58d93d9edd7f6d1d9654c8 (diff) | |
| download | gdb-34248c3af73049fe1f8b7a4b9eb7ae09f42eed95.zip gdb-34248c3af73049fe1f8b7a4b9eb7ae09f42eed95.tar.gz gdb-34248c3af73049fe1f8b7a4b9eb7ae09f42eed95.tar.bz2 | |
PR symtab/17559
Basically the problem is that "symtab" is ambiguous.
Is it the primary symtab (where we canonically think of
blockvectors as being stored) or is it for a specific file
(where each file's line table is stored) ?
gdb_disassembly wants the symtab that contains the line table
but is instead getting the primary symtab.
gdb/ChangeLog:
PR symtab/17559
* symtab.c (find_pc_line_symtab): New function.
* symtab.h (find_pc_line_symtab): Declare.
* disasm.c (gdb_disassembly): Call find_pc_line_symtab instead of
find_pc_symtab.
* tui/tui-disasm.c (tui_set_disassem_content): Ditto.
* tui/tui-hooks.c (tui_selected_frame_level_changed_hook): Ditto.
* tui/tui-source.c (tui_vertical_source_scroll): Ditto.
* tui/tui-win.c (make_visible_with_new_height): Ditto.
* tui/tui-winsource.c (tui_horizontal_source_scroll): Ditto.
(tui_display_main): Call find_pc_line_symtab instead of find_pc_line.
gdb/testsuite/ChangeLog:
PR symtab/17559
* gdb.base/line-symtabs.exp: New file.
* gdb.base/line-symtabs.c: New file.
* gdb.base/line-symtabs.h: New file.
Diffstat (limited to 'gdb/tui/tui-winsource.c')
| -rw-r--r-- | gdb/tui/tui-winsource.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 171b171..48a95e4 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -51,12 +51,12 @@ tui_display_main (void) tui_get_begin_asm_address (&gdbarch, &addr); if (addr != (CORE_ADDR) 0) { - struct symtab_and_line sal; + struct symtab *s; tui_update_source_windows_with_addr (gdbarch, addr); - sal = find_pc_line (addr, 0); - if (sal.symtab) - tui_update_locator_fullname (symtab_to_fullname (sal.symtab)); + s = find_pc_line_symtab (addr); + if (s != NULL) + tui_update_locator_fullname (symtab_to_fullname (s)); else tui_update_locator_fullname ("??"); } @@ -331,7 +331,7 @@ tui_horizontal_source_scroll (struct tui_win_info *win_info, = get_current_source_symtab_and_line (); if (cursal.symtab == NULL) - s = find_pc_symtab (get_frame_pc (get_selected_frame (NULL))); + s = find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL))); else s = cursal.symtab; } |