diff options
Diffstat (limited to 'gdb/tui/tui-disasm.c')
| -rw-r--r-- | gdb/tui/tui-disasm.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index e0ea183..8c48d66 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -37,6 +37,7 @@ #include "tui/tui-file.h" #include "tui/tui-disasm.h" #include "progspace.h" +#include "objfiles.h" #include "gdb_curses.h" @@ -113,7 +114,7 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from) { CORE_ADDR last_addr; int pos; - struct minimal_symbol *msymbol; + struct bound_minimal_symbol msymbol; /* Find backward an address which is a symbol and for which disassembling from that address will fill completely the @@ -121,16 +122,16 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from) pos = max_lines - 1; do { new_low -= 1 * max_lines; - msymbol = lookup_minimal_symbol_by_pc_section (new_low, 0).minsym; + msymbol = lookup_minimal_symbol_by_pc_section (new_low, 0); - if (msymbol) - new_low = MSYMBOL_VALUE_ADDRESS (msymbol); + if (msymbol.minsym) + new_low = BMSYMBOL_VALUE_ADDRESS (msymbol); else new_low += 1 * max_lines; tui_disassemble (gdbarch, asm_lines, new_low, max_lines); last_addr = asm_lines[pos].addr; - } while (last_addr > pc && msymbol); + } while (last_addr > pc && msymbol.minsym); /* Scan forward disassembling one instruction at a time until the last visible instruction of the window matches the pc. @@ -349,7 +350,7 @@ tui_get_begin_asm_address (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p) if (main_symbol.minsym == 0) main_symbol = lookup_minimal_symbol ("_start", NULL, NULL); if (main_symbol.minsym) - addr = MSYMBOL_VALUE_ADDRESS (main_symbol.minsym); + addr = BMSYMBOL_VALUE_ADDRESS (main_symbol); else addr = 0; } |