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/disasm.c | |
| parent | 2097ae2584c1018a7a58d93d9edd7f6d1d9654c8 (diff) | |
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/disasm.c')
| -rw-r--r-- | gdb/disasm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/disasm.c b/gdb/disasm.c index 6ff3793f2e..365aa94f09 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -410,13 +410,12 @@ gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, struct ui_file *stb = mem_fileopen (); struct cleanup *cleanups = make_cleanup_ui_file_delete (stb); struct disassemble_info di = gdb_disassemble_info (gdbarch, stb); - /* To collect the instruction outputted from opcodes. */ - struct symtab *symtab = NULL; + struct symtab *symtab; struct linetable_entry *le = NULL; int nlines = -1; /* Assume symtab is valid for whole PC range. */ - symtab = find_pc_symtab (low); + symtab = find_pc_line_symtab (low); if (symtab != NULL && symtab->linetable != NULL) { |