mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-01 22:34:22 +08:00
d7e747318f
This patch starts from the desire to eliminate make_cleanup_ui_file_delete, but then goes beyond. It makes ui_file & friends a real C++ class hierarchy, and switches temporary ui_file-like objects to stack-based allocation. - mem_fileopen -> string_file mem_fileopen is replaced with a new string_file class that is treated as a value class created on the stack. This alone eliminates most make_cleanup_ui_file_delete calls, and, simplifies code a whole lot (diffstat shows around 1k loc dropped.) string_file's internal buffer is a std::string, thus the "string" in the name. This simplifies the implementation much, compared to mem_fileopen, which managed growing its internal buffer manually. - ui_file_as_string, ui_file_strdup, ui_file_obsavestring all gone The new string_file class has a string() method that provides direct writable access to the internal std::string buffer. This replaced ui_file_as_string, which forced a copy of the same data the stream had inside. With direct access via a writable reference, we can instead move the string out of the string_stream, avoiding deep string copying. Related, ui_file_xstrdup calls are replaced with xstrdup'ping the stream's string, and ui_file_obsavestring is replaced by obstack_copy0. With all those out of the way, getting rid of the weird ui_file_put mechanism was possible. - New ui_file::printf, ui_file::puts, etc. methods These simplify / clarify client code. I considered splitting client-code changes, like these, e.g.: - stb = mem_fileopen (); - fprintf_unfiltered (stb, "%s%s%s", - _("The valid values are:\n"), - regdesc, - _("The default is \"std\".")); + string_file stb; + stb.printf ("%s%s%s", + _("The valid values are:\n"), + regdesc, + _("The default is \"std\".")); In two steps, with the first step leaving fprintf_unfiltered (etc.) calls in place, and only afterwards do a pass to change all those to call stb.printf etc.. I didn't do that split, because (when I tried), it turned out to be pointless make-work: the first pass would have to touch the fprintf_unfiltered line anyway, to replace "stb" with "&stb". - gdb_fopen replaced with stack-based objects This avoids the need for cleanups or unique_ptr's. I.e., this: struct ui_file *file = gdb_fopen (filename, "w"); if (filename == NULL) perror_with_name (filename); cleanups = make_cleanup_ui_file_delete (file); // use file. do_cleanups (cleanups); is replaced with this: stdio_file file; if (!file.open (filename, "w")) perror_with_name (filename); // use file. - odd contorsions in null_file_write / null_file_fputs around when to call to_fputs / to_write eliminated. - Global null_stream object A few places that were allocating a ui_file in order to print to "nowhere" are adjusted to instead refer to a new 'null_stream' global stream. - TUI's tui_sfileopen eliminated. TUI's ui_file much simplified The TUI's ui_file was serving a dual purpose. It supported being used as string buffer, and supported being backed by a stdio FILE. The string buffer part is gone, replaced by using of string_file. The 'FILE *' support is now much simplified, by making the TUI's ui_file inherit from stdio_file. gdb/ChangeLog: 2017-02-02 Pedro Alves <palves@redhat.com> * ada-lang.c (type_as_string): Use string_file. * ada-valprint.c (ada_print_floating): Use string_file. * ada-varobj.c (ada_varobj_scalar_image) (ada_varobj_get_value_image): Use string_file. * aix-thread.c (aix_thread_extra_thread_info): Use string_file. * arm-tdep.c (_initialize_arm_tdep): Use string_printf. * breakpoint.c (update_inserted_breakpoint_locations) (insert_breakpoint_locations, reattach_breakpoints) (print_breakpoint_location, print_one_detail_ranged_breakpoint) (print_it_watchpoint): Use string_file. (save_breakpoints): Use stdio_file. * c-exp.y (oper): Use string_file. * cli/cli-logging.c (set_logging_redirect): Use ui_file_up and tee_file. (pop_output_files): Use delete. (handle_redirections): Use stdio_file and tee_file. * cli/cli-setshow.c (do_show_command): Use string_file. * compile/compile-c-support.c (c_compute_program): Use string_file. * compile/compile-c-symbols.c (generate_vla_size): Take a 'string_file &' instead of a 'ui_file *'. (generate_c_for_for_one_variable): Take a 'string_file &' instead of a 'ui_file *'. Use string_file. (generate_c_for_variable_locations): Take a 'string_file &' instead of a 'ui_file *'. * compile/compile-internal.h (generate_c_for_for_one_variable): Take a 'string_file &' instead of a 'ui_file *'. * compile/compile-loc2c.c (push, pushf, unary, binary) (print_label, pushf_register_address, pushf_register) (do_compile_dwarf_expr_to_c): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * compile/compile.c (compile_to_object): Use string_file. * compile/compile.h (compile_dwarf_expr_to_c) (compile_dwarf_bounds_to_c): Take a 'string_file &' instead of a 'ui_file *'. * cp-support.c (inspect_type): Use string_file and obstack_copy0. (replace_typedefs_qualified_name): Use string_file and obstack_copy0. * disasm.c (gdb_pretty_print_insn): Use string_file. (gdb_disassembly): Adjust reference the null_stream global. (do_ui_file_delete): Delete. (gdb_insn_length): Use null_stream. * dummy-frame.c (maintenance_print_dummy_frames): Use stdio_file. * dwarf2loc.c (dwarf2_compile_property_to_c) (locexpr_generate_c_location, loclist_generate_c_location): Take a 'string_file &' instead of a 'ui_file *'. * dwarf2loc.h (dwarf2_compile_property_to_c): Likewise. * dwarf2read.c (do_ui_file_peek_last): Delete. (dwarf2_compute_name): Use string_file. * event-top.c (gdb_setup_readline): Use stdio_file. * gdbarch.sh (verify_gdbarch): Use string_file. * gdbtypes.c (safe_parse_type): Use null_stream. * guile/scm-breakpoint.c (gdbscm_breakpoint_commands): Use string_file. * guile/scm-disasm.c (gdbscm_print_insn_from_port): Take a 'string_file *' instead of a 'ui_file *'. (gdbscm_arch_disassemble): Use string_file. * guile/scm-frame.c (frscm_print_frame_smob): Use string_file. * guile/scm-ports.c (class ioscm_file_port): Now a class that inherits from ui_file. (ioscm_file_port_delete, ioscm_file_port_rewind) (ioscm_file_port_put): Delete. (ioscm_file_port_write): Rename to ... (ioscm_file_port::write): ... this. Remove file_port_magic checks. (ioscm_file_port_new): Delete. (ioscm_with_output_to_port_worker): Use ioscm_file_port and ui_file_up. * guile/scm-type.c (tyscm_type_name): Use string_file. * guile/scm-value.c (vlscm_print_value_smob, gdbscm_value_print): Use string_file. * infcmd.c (print_return_value_1): Use string_file. * infrun.c (print_target_wait_results): Use string_file. * language.c (add_language): Use string_file. * location.c (explicit_to_string_internal): Use string_file. * main.c (captured_main_1): Use null_file. * maint.c (maintenance_print_architecture): Use stdio_file. * mi/mi-cmd-stack.c (list_arg_or_local): Use string_file. * mi/mi-common.h (struct mi_interp) <out, err, log, targ, event_channel>: Change type to mi_console_file pointer. * mi/mi-console.c (mi_console_file_fputs, mi_console_file_flush) (mi_console_file_delete): Delete. (struct mi_console_file): Delete. (mi_console_file_magic): Delete. (mi_console_file_new): Delete. (mi_console_file::mi_console_file): New. (mi_console_file_delete): Delete. (mi_console_file_fputs): Delete. (mi_console_file::write): New. (mi_console_raw_packet): Delete. (mi_console_file::flush): New. (mi_console_file_flush): Delete. (mi_console_set_raw): Rename to ... (mi_console_file::set_raw): ... this. * mi/mi-console.h (class mi_console_file): New class. (mi_console_file_new, mi_console_set_raw): Delete. * mi/mi-interp.c (mi_interpreter_init): Use mi_console_file. (mi_set_logging): Use delete and tee_file. Adjust. * mi/mi-main.c (output_register): Use string_file. (mi_cmd_data_evaluate_expression): Use string_file. (mi_cmd_data_read_memory): Use string_file. (mi_cmd_execute, print_variable_or_computed): Use string_file. * mi/mi-out.c (mi_ui_out::main_stream): New. (mi_ui_out::rewind): Use main_stream and string_file. (mi_ui_out::put): Use main_stream and string_file. (mi_ui_out::mi_ui_out): Remove 'stream' parameter. Allocate a 'string_file' instead. (mi_out_new): Don't allocate a mem_fileopen stream here. * mi/mi-out.h (mi_ui_out::mi_ui_out): Remove 'stream' parameter. (mi_ui_out::main_stream): Declare method. * printcmd.c (eval_command): Use string_file. * psymtab.c (maintenance_print_psymbols): Use stdio_file. * python/py-arch.c (archpy_disassemble): Use string_file. * python/py-breakpoint.c (bppy_get_commands): Use string_file. * python/py-frame.c (frapy_str): Use string_file. * python/py-framefilter.c (py_print_type, py_print_single_arg): Use string_file. * python/py-type.c (typy_str): Use string_file. * python/py-unwind.c (unwind_infopy_str): Use string_file. * python/py-value.c (valpy_str): Use string_file. * record-btrace.c (btrace_insn_history): Use string_file. * regcache.c (regcache_print): Use stdio_file. * reggroups.c (maintenance_print_reggroups): Use stdio_file. * remote.c (escape_buffer): Use string_file. * rust-lang.c (rust_get_disr_info): Use string_file. * serial.c (serial_open_ops_1): Use stdio_file. (do_serial_close): Use delete. * stack.c (print_frame_arg): Use string_file. (print_frame_args): Remove local mem_fileopen stream, not used. (print_frame): Use string_file. * symmisc.c (maintenance_print_symbols): Use stdio_file. * symtab.h (struct symbol_computed_ops) <generate_c_location>: Take a 'string_file *' instead of a 'ui_file *'. * top.c (new_ui): Use stdio_file and stderr_file. (free_ui): Use delete. (execute_command_to_string): Use string_file. (quit_confirm): Use string_file. * tracepoint.c (collection_list::append_exp): Use string_file. * tui/tui-disasm.c (tui_disassemble): Use string_file. * tui/tui-file.c: Don't include "ui-file.h". (enum streamtype, struct tui_stream): Delete. (tui_file_new, tui_file_delete, tui_fileopen, tui_sfileopen) (tui_file_isatty, tui_file_rewind, tui_file_put): Delete. (tui_file::tui_file): New method. (tui_file_fputs): Delete. (tui_file_get_strbuf): Delete. (tui_file::puts): New method. (tui_file_adjust_strbuf): Delete. (tui_file_flush): Delete. (tui_file::flush): New method. * tui/tui-file.h: Tweak intro comment. Include ui-file.h. (tui_fileopen, tui_sfileopen, tui_file_get_strbuf) (tui_file_adjust_strbuf): Delete declarations. (class tui_file): New class. * tui/tui-io.c (tui_initialize_io): Use tui_file. * tui/tui-regs.c (tui_restore_gdbout): Use delete. (tui_register_format): Use string_stream. * tui/tui-stack.c (tui_make_status_line): Use string_file. (tui_get_function_from_frame): Use string_file. * typeprint.c (type_to_string): Use string_file. * ui-file.c (struct ui_file, ui_file_magic, ui_file_new): Delete. (null_stream): New global. (ui_file_delete): Delete. (ui_file::ui_file): New. (null_file_isatty): Delete. (ui_file::~ui_file): New. (null_file_rewind): Delete. (ui_file::printf): New. (null_file_put): Delete. (null_file_flush): Delete. (ui_file::putstr): New. (null_file_write): Delete. (ui_file::putstrn): New. (null_file_read): Delete. (ui_file::putc): New. (null_file_fputs): Delete. (null_file_write_async_safe): Delete. (ui_file::vprintf): New. (null_file_delete): Delete. (null_file::write): New. (null_file_fseek): Delete. (null_file::puts): New. (ui_file_data): Delete. (null_file::write_async_safe): New. (gdb_flush, ui_file_isatty): Adjust. (ui_file_put, ui_file_rewind): Delete. (ui_file_write): Adjust. (ui_file_write_for_put): Delete. (ui_file_write_async_safe, ui_file_read): Adjust. (ui_file_fseek): Delete. (fputs_unfiltered): Adjust. (set_ui_file_flush, set_ui_file_isatty, set_ui_file_rewind) (set_ui_file_put, set_ui_file_write, set_ui_file_write_async_safe) (set_ui_file_read, set_ui_file_fputs, set_ui_file_fseek) (set_ui_file_data): Delete. (string_file::~string_file, string_file::write) (struct accumulated_ui_file, do_ui_file_xstrdup, ui_file_xstrdup) (do_ui_file_as_string, ui_file_as_string): Delete. (do_ui_file_obsavestring, ui_file_obsavestring): Delete. (struct mem_file): Delete. (mem_file_new): Delete. (stdio_file::stdio_file): New. (mem_file_delete): Delete. (stdio_file::stdio_file): New. (mem_fileopen): Delete. (stdio_file::~stdio_file): New. (mem_file_rewind): Delete. (stdio_file::set_stream): New. (mem_file_put): Delete. (stdio_file::open): New. (mem_file_write): Delete. (stdio_file_magic, struct stdio_file): Delete. (stdio_file_new, stdio_file_delete, stdio_file_flush): Delete. (stdio_file::flush): New. (stdio_file_read): Rename to ... (stdio_file::read): ... this. Adjust. (stdio_file_write): Rename to ... (stdio_file::write): ... this. Adjust. (stdio_file_write_async_safe): Rename to ... (stdio_file::write_async_safe) ... this. Adjust. (stdio_file_fputs): Rename to ... (stdio_file::puts) ... this. Adjust. (stdio_file_isatty): Delete. (stdio_file_fseek): Delete. (stdio_file::isatty): New. (stderr_file_write): Rename to ... (stderr_file::write) ... this. Adjust. (stderr_file_fputs): Rename to ... (stderr_file::puts) ... this. Adjust. (stderr_fileopen, stdio_fileopen, gdb_fopen): Delete. (stderr_file::stderr_file): New. (tee_file_magic): Delete. (struct tee_file): Delete. (tee_file::tee_file): New. (tee_file_new): Delete. (tee_file::~tee_file): New. (tee_file_delete): Delete. (tee_file_flush): Rename to ... (tee_file::flush): ... this. Adjust. (tee_file_write): Rename to ... (tee_file::write): ... this. Adjust. (tee_file::write_async_safe): New. (tee_file_fputs): Rename to ... (tee_file::puts): ... this. Adjust. (tee_file_isatty): Rename to ... (tee_file::isatty): ... this. Adjust. * ui-file.h (struct obstack, struct ui_file): Don't forward-declare. (ui_file_new, ui_file_flush_ftype, set_ui_file_flush) (ui_file_write_ftype) (set_ui_file_write, ui_file_fputs_ftype, set_ui_file_fputs) (ui_file_write_async_safe_ftype, set_ui_file_write_async_safe) (ui_file_read_ftype, set_ui_file_read, ui_file_isatty_ftype) (set_ui_file_isatty, ui_file_rewind_ftype, set_ui_file_rewind) (ui_file_put_method_ftype, ui_file_put_ftype, set_ui_file_put) (ui_file_delete_ftype, set_ui_file_data, ui_file_fseek_ftype) (set_ui_file_fseek): Delete. (ui_file_data, ui_file_delete, ui_file_rewind) (struct ui_file): New. (ui_file_up): New. (class null_file): New. (null_stream): Declare. (ui_file_write_for_put, ui_file_put): Delete. (ui_file_xstrdup, ui_file_as_string, ui_file_obsavestring): Delete. (ui_file_fseek, mem_fileopen, stdio_fileopen, stderr_fileopen) (gdb_fopen, tee_file_new): Delete. (struct string_file): New. (struct stdio_file): New. (stdio_file_up): New. (struct stderr_file): New. (class tee_file): New. * ui-out.c (ui_out::field_stream): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * ui-out.h (class ui_out) <field_stream>: Likewise. * utils.c (do_ui_file_delete, make_cleanup_ui_file_delete) (null_stream): Delete. (error_stream): Take a 'string_file &' instead of a 'ui_file *'. Adjust. * utils.h (struct ui_file): Delete forward declaration.. (make_cleanup_ui_file_delete, null_stream): Delete declarations. (error_stream): Take a 'string_file &' instead of a 'ui_file *'. * varobj.c (varobj_value_get_print_value): Use string_file. * xtensa-tdep.c (xtensa_verify_config): Use string_file. * gdbarch.c: Regenerate.
400 lines
11 KiB
C
400 lines
11 KiB
C
/* Disassembly display.
|
|
|
|
Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
|
|
|
Contributed by Hewlett-Packard Company.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "arch-utils.h"
|
|
#include "symtab.h"
|
|
#include "breakpoint.h"
|
|
#include "frame.h"
|
|
#include "value.h"
|
|
#include "source.h"
|
|
#include "disasm.h"
|
|
#include "tui/tui.h"
|
|
#include "tui/tui-data.h"
|
|
#include "tui/tui-win.h"
|
|
#include "tui/tui-layout.h"
|
|
#include "tui/tui-winsource.h"
|
|
#include "tui/tui-stack.h"
|
|
#include "tui/tui-file.h"
|
|
#include "tui/tui-disasm.h"
|
|
#include "progspace.h"
|
|
#include "objfiles.h"
|
|
|
|
#include "gdb_curses.h"
|
|
|
|
struct tui_asm_line
|
|
{
|
|
CORE_ADDR addr;
|
|
char *addr_string;
|
|
char *insn;
|
|
};
|
|
|
|
/* Function to set the disassembly window's content.
|
|
Disassemble count lines starting at pc.
|
|
Return address of the count'th instruction after pc. */
|
|
static CORE_ADDR
|
|
tui_disassemble (struct gdbarch *gdbarch, struct tui_asm_line *asm_lines,
|
|
CORE_ADDR pc, int count)
|
|
{
|
|
string_file gdb_dis_out;
|
|
|
|
/* Now construct each line. */
|
|
for (; count > 0; count--, asm_lines++)
|
|
{
|
|
if (asm_lines->addr_string)
|
|
xfree (asm_lines->addr_string);
|
|
if (asm_lines->insn)
|
|
xfree (asm_lines->insn);
|
|
|
|
print_address (gdbarch, pc, &gdb_dis_out);
|
|
asm_lines->addr = pc;
|
|
asm_lines->addr_string = xstrdup (gdb_dis_out.c_str ());
|
|
|
|
gdb_dis_out.clear ();
|
|
|
|
pc = pc + gdb_print_insn (gdbarch, pc, &gdb_dis_out, NULL);
|
|
|
|
asm_lines->insn = xstrdup (gdb_dis_out.c_str ());
|
|
|
|
/* Reset the buffer to empty. */
|
|
gdb_dis_out.clear ();
|
|
}
|
|
return pc;
|
|
}
|
|
|
|
/* Find the disassembly address that corresponds to FROM lines above
|
|
or below the PC. Variable sized instructions are taken into
|
|
account by the algorithm. */
|
|
static CORE_ADDR
|
|
tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from)
|
|
{
|
|
CORE_ADDR new_low;
|
|
int max_lines;
|
|
int i;
|
|
struct tui_asm_line *asm_lines;
|
|
|
|
max_lines = (from > 0) ? from : - from;
|
|
if (max_lines <= 1)
|
|
return pc;
|
|
|
|
asm_lines = XALLOCAVEC (struct tui_asm_line, max_lines);
|
|
memset (asm_lines, 0, sizeof (struct tui_asm_line) * max_lines);
|
|
|
|
new_low = pc;
|
|
if (from > 0)
|
|
{
|
|
tui_disassemble (gdbarch, asm_lines, pc, max_lines);
|
|
new_low = asm_lines[max_lines - 1].addr;
|
|
}
|
|
else
|
|
{
|
|
CORE_ADDR last_addr;
|
|
int pos;
|
|
struct bound_minimal_symbol msymbol;
|
|
|
|
/* Find backward an address which is a symbol and for which
|
|
disassembling from that address will fill completely the
|
|
window. */
|
|
pos = max_lines - 1;
|
|
do {
|
|
new_low -= 1 * max_lines;
|
|
msymbol = lookup_minimal_symbol_by_pc_section (new_low, 0);
|
|
|
|
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.minsym);
|
|
|
|
/* Scan forward disassembling one instruction at a time until
|
|
the last visible instruction of the window matches the pc.
|
|
We keep the disassembled instructions in the 'lines' window
|
|
and shift it downward (increasing its addresses). */
|
|
if (last_addr < pc)
|
|
do
|
|
{
|
|
CORE_ADDR next_addr;
|
|
|
|
pos++;
|
|
if (pos >= max_lines)
|
|
pos = 0;
|
|
|
|
next_addr = tui_disassemble (gdbarch, &asm_lines[pos],
|
|
last_addr, 1);
|
|
|
|
/* If there are some problems while disassembling exit. */
|
|
if (next_addr <= last_addr)
|
|
break;
|
|
last_addr = next_addr;
|
|
} while (last_addr <= pc);
|
|
pos++;
|
|
if (pos >= max_lines)
|
|
pos = 0;
|
|
new_low = asm_lines[pos].addr;
|
|
}
|
|
for (i = 0; i < max_lines; i++)
|
|
{
|
|
xfree (asm_lines[i].addr_string);
|
|
xfree (asm_lines[i].insn);
|
|
}
|
|
return new_low;
|
|
}
|
|
|
|
/* Function to set the disassembly window's content. */
|
|
enum tui_status
|
|
tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
|
|
{
|
|
enum tui_status ret = TUI_FAILURE;
|
|
int i;
|
|
int offset = TUI_DISASM_WIN->detail.source_info.horizontal_offset;
|
|
int max_lines, line_width;
|
|
CORE_ADDR cur_pc;
|
|
struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
|
|
int tab_len = tui_default_tab_len ();
|
|
struct tui_asm_line *asm_lines;
|
|
int insn_pos;
|
|
int addr_size, insn_size;
|
|
char *line;
|
|
|
|
if (pc == 0)
|
|
return TUI_FAILURE;
|
|
|
|
ret = tui_alloc_source_buffer (TUI_DISASM_WIN);
|
|
if (ret != TUI_SUCCESS)
|
|
return ret;
|
|
|
|
TUI_DISASM_WIN->detail.source_info.gdbarch = gdbarch;
|
|
TUI_DISASM_WIN->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS;
|
|
TUI_DISASM_WIN->detail.source_info.start_line_or_addr.u.addr = pc;
|
|
cur_pc = locator->content[0]->which_element.locator.addr;
|
|
|
|
/* Window size, excluding highlight box. */
|
|
max_lines = TUI_DISASM_WIN->generic.height - 2;
|
|
line_width = TUI_DISASM_WIN->generic.width - 2;
|
|
|
|
/* Get temporary table that will hold all strings (addr & insn). */
|
|
asm_lines = XALLOCAVEC (struct tui_asm_line, max_lines);
|
|
memset (asm_lines, 0, sizeof (struct tui_asm_line) * max_lines);
|
|
|
|
tui_disassemble (gdbarch, asm_lines, pc, max_lines);
|
|
|
|
/* Determine maximum address- and instruction lengths. */
|
|
addr_size = 0;
|
|
insn_size = 0;
|
|
for (i = 0; i < max_lines; i++)
|
|
{
|
|
size_t len = strlen (asm_lines[i].addr_string);
|
|
|
|
if (len > addr_size)
|
|
addr_size = len;
|
|
|
|
len = strlen (asm_lines[i].insn);
|
|
if (len > insn_size)
|
|
insn_size = len;
|
|
}
|
|
|
|
/* Align instructions to the same column. */
|
|
insn_pos = (1 + (addr_size / tab_len)) * tab_len;
|
|
|
|
/* Allocate memory to create each line. */
|
|
line = (char*) alloca (insn_pos + insn_size + 1);
|
|
|
|
/* Now construct each line. */
|
|
for (i = 0; i < max_lines; i++)
|
|
{
|
|
struct tui_win_element *element;
|
|
struct tui_source_element *src;
|
|
int cur_len;
|
|
|
|
element = TUI_DISASM_WIN->generic.content[i];
|
|
src = &element->which_element.source;
|
|
strcpy (line, asm_lines[i].addr_string);
|
|
cur_len = strlen (line);
|
|
memset (line + cur_len, ' ', insn_pos - cur_len);
|
|
strcpy (line + insn_pos, asm_lines[i].insn);
|
|
|
|
/* Now copy the line taking the offset into account. */
|
|
if (strlen (line) > offset)
|
|
{
|
|
strncpy (src->line, &line[offset], line_width);
|
|
src->line[line_width] = '\0';
|
|
}
|
|
else
|
|
src->line[0] = '\0';
|
|
|
|
src->line_or_addr.loa = LOA_ADDRESS;
|
|
src->line_or_addr.u.addr = asm_lines[i].addr;
|
|
src->is_exec_point = asm_lines[i].addr == cur_pc;
|
|
|
|
/* See whether there is a breakpoint installed. */
|
|
src->has_break = (!src->is_exec_point
|
|
&& breakpoint_here_p (current_program_space->aspace,
|
|
pc)
|
|
!= no_breakpoint_here);
|
|
|
|
xfree (asm_lines[i].addr_string);
|
|
xfree (asm_lines[i].insn);
|
|
}
|
|
TUI_DISASM_WIN->generic.content_size = i;
|
|
return TUI_SUCCESS;
|
|
}
|
|
|
|
|
|
/* Function to display the disassembly window with disassembled code. */
|
|
void
|
|
tui_show_disassem (struct gdbarch *gdbarch, CORE_ADDR start_addr)
|
|
{
|
|
struct symtab *s = find_pc_line_symtab (start_addr);
|
|
struct tui_win_info *win_with_focus = tui_win_with_focus ();
|
|
struct tui_line_or_address val;
|
|
|
|
val.loa = LOA_ADDRESS;
|
|
val.u.addr = start_addr;
|
|
tui_add_win_to_layout (DISASSEM_WIN);
|
|
tui_update_source_window (TUI_DISASM_WIN, gdbarch, s, val, FALSE);
|
|
|
|
/* If the focus was in the src win, put it in the asm win, if the
|
|
source view isn't split. */
|
|
if (tui_current_layout () != SRC_DISASSEM_COMMAND
|
|
&& win_with_focus == TUI_SRC_WIN)
|
|
tui_set_win_focus_to (TUI_DISASM_WIN);
|
|
|
|
return;
|
|
}
|
|
|
|
|
|
/* Function to display the disassembly window. */
|
|
void
|
|
tui_show_disassem_and_update_source (struct gdbarch *gdbarch,
|
|
CORE_ADDR start_addr)
|
|
{
|
|
struct symtab_and_line sal;
|
|
|
|
tui_show_disassem (gdbarch, start_addr);
|
|
if (tui_current_layout () == SRC_DISASSEM_COMMAND)
|
|
{
|
|
struct tui_line_or_address val;
|
|
|
|
/* Update what is in the source window if it is displayed too,
|
|
note that it follows what is in the disassembly window and
|
|
visa-versa. */
|
|
sal = find_pc_line (start_addr, 0);
|
|
val.loa = LOA_LINE;
|
|
val.u.line_no = sal.line;
|
|
tui_update_source_window (TUI_SRC_WIN, gdbarch, sal.symtab, val, TRUE);
|
|
if (sal.symtab)
|
|
{
|
|
set_current_source_symtab_and_line (&sal);
|
|
tui_update_locator_fullname (symtab_to_fullname (sal.symtab));
|
|
}
|
|
else
|
|
tui_update_locator_fullname ("?");
|
|
}
|
|
|
|
return;
|
|
}
|
|
|
|
void
|
|
tui_get_begin_asm_address (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
|
|
{
|
|
struct tui_gen_win_info *locator;
|
|
struct tui_locator_element *element;
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
CORE_ADDR addr;
|
|
|
|
locator = tui_locator_win_info_ptr ();
|
|
element = &locator->content[0]->which_element.locator;
|
|
|
|
if (element->addr == 0)
|
|
{
|
|
struct bound_minimal_symbol main_symbol;
|
|
|
|
/* Find address of the start of program.
|
|
Note: this should be language specific. */
|
|
main_symbol = lookup_minimal_symbol ("main", NULL, NULL);
|
|
if (main_symbol.minsym == 0)
|
|
main_symbol = lookup_minimal_symbol ("MAIN", NULL, NULL);
|
|
if (main_symbol.minsym == 0)
|
|
main_symbol = lookup_minimal_symbol ("_start", NULL, NULL);
|
|
if (main_symbol.minsym)
|
|
addr = BMSYMBOL_VALUE_ADDRESS (main_symbol);
|
|
else
|
|
addr = 0;
|
|
}
|
|
else /* The target is executing. */
|
|
{
|
|
gdbarch = element->gdbarch;
|
|
addr = element->addr;
|
|
}
|
|
|
|
*gdbarch_p = gdbarch;
|
|
*addr_p = addr;
|
|
}
|
|
|
|
/* Determine what the low address will be to display in the TUI's
|
|
disassembly window. This may or may not be the same as the low
|
|
address input. */
|
|
CORE_ADDR
|
|
tui_get_low_disassembly_address (struct gdbarch *gdbarch,
|
|
CORE_ADDR low, CORE_ADDR pc)
|
|
{
|
|
int pos;
|
|
|
|
/* Determine where to start the disassembly so that the pc is about
|
|
in the middle of the viewport. */
|
|
pos = tui_default_win_viewport_height (DISASSEM_WIN, DISASSEM_COMMAND) / 2;
|
|
pc = tui_find_disassembly_address (gdbarch, pc, -pos);
|
|
|
|
if (pc < low)
|
|
pc = low;
|
|
return pc;
|
|
}
|
|
|
|
/* Scroll the disassembly forward or backward vertically. */
|
|
void
|
|
tui_vertical_disassem_scroll (enum tui_scroll_direction scroll_direction,
|
|
int num_to_scroll)
|
|
{
|
|
if (TUI_DISASM_WIN->generic.content != NULL)
|
|
{
|
|
struct gdbarch *gdbarch = TUI_DISASM_WIN->detail.source_info.gdbarch;
|
|
CORE_ADDR pc;
|
|
tui_win_content content;
|
|
struct tui_line_or_address val;
|
|
int dir;
|
|
|
|
content = (tui_win_content) TUI_DISASM_WIN->generic.content;
|
|
|
|
pc = content[0]->which_element.source.line_or_addr.u.addr;
|
|
num_to_scroll++;
|
|
dir = (scroll_direction == FORWARD_SCROLL)
|
|
? num_to_scroll : -num_to_scroll;
|
|
|
|
val.loa = LOA_ADDRESS;
|
|
val.u.addr = tui_find_disassembly_address (gdbarch, pc, dir);
|
|
tui_update_source_window_as_is (TUI_DISASM_WIN, gdbarch,
|
|
NULL, val, FALSE);
|
|
}
|
|
}
|