forked from Imagelibrary/binutils-gdb
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.
511 lines
14 KiB
C
511 lines
14 KiB
C
/* TUI display locator.
|
||
|
||
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 "symtab.h"
|
||
#include "breakpoint.h"
|
||
#include "frame.h"
|
||
#include "command.h"
|
||
#include "inferior.h"
|
||
#include "target.h"
|
||
#include "top.h"
|
||
#include "gdb-demangle.h"
|
||
#include "source.h"
|
||
#include "tui/tui.h"
|
||
#include "tui/tui-data.h"
|
||
#include "tui/tui-stack.h"
|
||
#include "tui/tui-wingeneral.h"
|
||
#include "tui/tui-source.h"
|
||
#include "tui/tui-winsource.h"
|
||
#include "tui/tui-file.h"
|
||
|
||
#include "gdb_curses.h"
|
||
|
||
/* Get a printable name for the function at the address.
|
||
The symbol name is demangled if demangling is turned on.
|
||
Returns a pointer to a static area holding the result. */
|
||
static char *tui_get_function_from_frame (struct frame_info *fi);
|
||
|
||
/* Set the full_name portion of the locator. */
|
||
static void tui_set_locator_fullname (const char *fullname);
|
||
|
||
/* Update the locator, with the provided arguments. */
|
||
static int tui_set_locator_info (struct gdbarch *gdbarch,
|
||
const char *fullname,
|
||
const char *procname,
|
||
int lineno, CORE_ADDR addr);
|
||
|
||
static void tui_update_command (char *, int);
|
||
|
||
|
||
/* Create the status line to display as much information as we can on
|
||
this single line: target name, process number, current function,
|
||
current line, current PC, SingleKey mode. */
|
||
static char*
|
||
tui_make_status_line (struct tui_locator_element *loc)
|
||
{
|
||
char *string;
|
||
char line_buf[50], *pname;
|
||
char *buf;
|
||
int status_size;
|
||
int i, proc_width;
|
||
const char *pid_name;
|
||
int target_width;
|
||
int pid_width;
|
||
int line_width;
|
||
|
||
if (ptid_equal (inferior_ptid, null_ptid))
|
||
pid_name = "No process";
|
||
else
|
||
pid_name = target_pid_to_str (inferior_ptid);
|
||
|
||
target_width = strlen (target_shortname);
|
||
if (target_width > MAX_TARGET_WIDTH)
|
||
target_width = MAX_TARGET_WIDTH;
|
||
|
||
pid_width = strlen (pid_name);
|
||
if (pid_width > MAX_PID_WIDTH)
|
||
pid_width = MAX_PID_WIDTH;
|
||
|
||
status_size = tui_term_width ();
|
||
string = (char *) xmalloc (status_size + 1);
|
||
buf = (char*) alloca (status_size + 1);
|
||
|
||
/* Translate line number and obtain its size. */
|
||
if (loc->line_no > 0)
|
||
xsnprintf (line_buf, sizeof (line_buf), "%d", loc->line_no);
|
||
else
|
||
strcpy (line_buf, "??");
|
||
line_width = strlen (line_buf);
|
||
if (line_width < MIN_LINE_WIDTH)
|
||
line_width = MIN_LINE_WIDTH;
|
||
|
||
/* Translate PC address. */
|
||
string_file pc_out;
|
||
|
||
fputs_filtered (loc->gdbarch? paddress (loc->gdbarch, loc->addr) : "??",
|
||
&pc_out);
|
||
|
||
const char *pc_buf = pc_out.c_str ();
|
||
int pc_width = pc_out.size ();
|
||
|
||
/* First determine the amount of proc name width we have available.
|
||
The +1 are for a space separator between fields.
|
||
The -1 are to take into account the \0 counted by sizeof. */
|
||
proc_width = (status_size
|
||
- (target_width + 1)
|
||
- (pid_width + 1)
|
||
- (sizeof (PROC_PREFIX) - 1 + 1)
|
||
- (sizeof (LINE_PREFIX) - 1 + line_width + 1)
|
||
- (sizeof (PC_PREFIX) - 1 + pc_width + 1)
|
||
- (tui_current_key_mode == TUI_SINGLE_KEY_MODE
|
||
? (sizeof (SINGLE_KEY) - 1 + 1)
|
||
: 0));
|
||
|
||
/* If there is no room to print the function name, try by removing
|
||
some fields. */
|
||
if (proc_width < MIN_PROC_WIDTH)
|
||
{
|
||
proc_width += target_width + 1;
|
||
target_width = 0;
|
||
if (proc_width < MIN_PROC_WIDTH)
|
||
{
|
||
proc_width += pid_width + 1;
|
||
pid_width = 0;
|
||
if (proc_width <= MIN_PROC_WIDTH)
|
||
{
|
||
proc_width += pc_width + sizeof (PC_PREFIX) - 1 + 1;
|
||
pc_width = 0;
|
||
if (proc_width < 0)
|
||
{
|
||
proc_width += line_width + sizeof (LINE_PREFIX) - 1 + 1;
|
||
line_width = 0;
|
||
if (proc_width < 0)
|
||
proc_width = 0;
|
||
}
|
||
}
|
||
}
|
||
}
|
||
|
||
/* Now convert elements to string form. */
|
||
pname = loc->proc_name;
|
||
|
||
/* Now create the locator line from the string version of the
|
||
elements. We could use sprintf() here but that wouldn't ensure
|
||
that we don't overrun the size of the allocated buffer.
|
||
strcat_to_buf() will. */
|
||
*string = (char) 0;
|
||
|
||
if (target_width > 0)
|
||
{
|
||
sprintf (buf, "%*.*s ",
|
||
-target_width, target_width, target_shortname);
|
||
strcat_to_buf (string, status_size, buf);
|
||
}
|
||
if (pid_width > 0)
|
||
{
|
||
sprintf (buf, "%*.*s ",
|
||
-pid_width, pid_width, pid_name);
|
||
strcat_to_buf (string, status_size, buf);
|
||
}
|
||
|
||
/* Show whether we are in SingleKey mode. */
|
||
if (tui_current_key_mode == TUI_SINGLE_KEY_MODE)
|
||
{
|
||
strcat_to_buf (string, status_size, SINGLE_KEY);
|
||
strcat_to_buf (string, status_size, " ");
|
||
}
|
||
|
||
/* Procedure/class name. */
|
||
if (proc_width > 0)
|
||
{
|
||
if (strlen (pname) > proc_width)
|
||
sprintf (buf, "%s%*.*s* ", PROC_PREFIX,
|
||
1 - proc_width, proc_width - 1, pname);
|
||
else
|
||
sprintf (buf, "%s%*.*s ", PROC_PREFIX,
|
||
-proc_width, proc_width, pname);
|
||
strcat_to_buf (string, status_size, buf);
|
||
}
|
||
|
||
if (line_width > 0)
|
||
{
|
||
sprintf (buf, "%s%*.*s ", LINE_PREFIX,
|
||
-line_width, line_width, line_buf);
|
||
strcat_to_buf (string, status_size, buf);
|
||
}
|
||
if (pc_width > 0)
|
||
{
|
||
strcat_to_buf (string, status_size, PC_PREFIX);
|
||
strcat_to_buf (string, status_size, pc_buf);
|
||
}
|
||
|
||
|
||
for (i = strlen (string); i < status_size; i++)
|
||
string[i] = ' ';
|
||
string[status_size] = (char) 0;
|
||
|
||
return string;
|
||
}
|
||
|
||
/* Get a printable name for the function at the address. The symbol
|
||
name is demangled if demangling is turned on. Returns a pointer to
|
||
a static area holding the result. */
|
||
static char*
|
||
tui_get_function_from_frame (struct frame_info *fi)
|
||
{
|
||
static char name[256];
|
||
string_file stream;
|
||
|
||
print_address_symbolic (get_frame_arch (fi), get_frame_pc (fi),
|
||
&stream, demangle, "");
|
||
|
||
/* Use simple heuristics to isolate the function name. The symbol
|
||
can be demangled and we can have function parameters. Remove
|
||
them because the status line is too short to display them. */
|
||
const char *d = stream.c_str ();
|
||
if (*d == '<')
|
||
d++;
|
||
strncpy (name, d, sizeof (name) - 1);
|
||
name[sizeof (name) - 1] = 0;
|
||
|
||
char *p = strchr (name, '(');
|
||
if (!p)
|
||
p = strchr (name, '>');
|
||
if (p)
|
||
*p = 0;
|
||
p = strchr (name, '+');
|
||
if (p)
|
||
*p = 0;
|
||
return name;
|
||
}
|
||
|
||
void
|
||
tui_show_locator_content (void)
|
||
{
|
||
char *string;
|
||
struct tui_gen_win_info *locator;
|
||
|
||
locator = tui_locator_win_info_ptr ();
|
||
|
||
if (locator != NULL && locator->handle != (WINDOW *) NULL)
|
||
{
|
||
struct tui_win_element *element;
|
||
|
||
element = locator->content[0];
|
||
|
||
string = tui_make_status_line (&element->which_element.locator);
|
||
wmove (locator->handle, 0, 0);
|
||
/* We ignore the return value from wstandout and wstandend, casting
|
||
them to void in order to avoid a compiler warning. The warning
|
||
itself was introduced by a patch to ncurses 5.7 dated 2009-08-29,
|
||
changing these macro to expand to code that causes the compiler
|
||
to generate an unused-value warning. */
|
||
(void) wstandout (locator->handle);
|
||
waddstr (locator->handle, string);
|
||
wclrtoeol (locator->handle);
|
||
(void) wstandend (locator->handle);
|
||
tui_refresh_win (locator);
|
||
wmove (locator->handle, 0, 0);
|
||
xfree (string);
|
||
locator->content_in_use = TRUE;
|
||
}
|
||
}
|
||
|
||
|
||
/* Set the filename portion of the locator. */
|
||
static void
|
||
tui_set_locator_fullname (const char *fullname)
|
||
{
|
||
struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
|
||
struct tui_locator_element *element;
|
||
|
||
if (locator->content[0] == NULL)
|
||
{
|
||
tui_set_locator_info (NULL, fullname, NULL, 0, 0);
|
||
return;
|
||
}
|
||
|
||
element = &locator->content[0]->which_element.locator;
|
||
element->full_name[0] = 0;
|
||
strcat_to_buf (element->full_name, MAX_LOCATOR_ELEMENT_LEN, fullname);
|
||
}
|
||
|
||
/* Update the locator, with the provided arguments.
|
||
|
||
Returns 1 if any of the locator's fields were actually changed,
|
||
and 0 otherwise. */
|
||
|
||
static int
|
||
tui_set_locator_info (struct gdbarch *gdbarch,
|
||
const char *fullname,
|
||
const char *procname,
|
||
int lineno,
|
||
CORE_ADDR addr)
|
||
{
|
||
struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
|
||
struct tui_locator_element *element;
|
||
int locator_changed_p = 0;
|
||
|
||
/* Allocate the locator content if necessary. */
|
||
if (locator->content_size <= 0)
|
||
{
|
||
locator->content = tui_alloc_content (1, LOCATOR_WIN);
|
||
locator->content_size = 1;
|
||
locator_changed_p = 1;
|
||
}
|
||
|
||
if (procname == NULL)
|
||
procname = "";
|
||
|
||
if (fullname == NULL)
|
||
fullname = "";
|
||
|
||
element = &locator->content[0]->which_element.locator;
|
||
|
||
locator_changed_p |= strncmp (element->proc_name, procname,
|
||
MAX_LOCATOR_ELEMENT_LEN) != 0;
|
||
locator_changed_p |= lineno != element->line_no;
|
||
locator_changed_p |= addr != element->addr;
|
||
locator_changed_p |= gdbarch != element->gdbarch;
|
||
locator_changed_p |= strncmp (element->full_name, fullname,
|
||
MAX_LOCATOR_ELEMENT_LEN) != 0;
|
||
|
||
element->proc_name[0] = (char) 0;
|
||
strcat_to_buf (element->proc_name, MAX_LOCATOR_ELEMENT_LEN, procname);
|
||
element->line_no = lineno;
|
||
element->addr = addr;
|
||
element->gdbarch = gdbarch;
|
||
tui_set_locator_fullname (fullname);
|
||
|
||
return locator_changed_p;
|
||
}
|
||
|
||
/* Update only the full_name portion of the locator. */
|
||
void
|
||
tui_update_locator_fullname (const char *fullname)
|
||
{
|
||
tui_set_locator_fullname (fullname);
|
||
tui_show_locator_content ();
|
||
}
|
||
|
||
/* Function to print the frame information for the TUI. The windows are
|
||
refreshed only if frame information has changed since the last refresh.
|
||
|
||
Return 1 if frame information has changed (and windows subsequently
|
||
refreshed), 0 otherwise. */
|
||
|
||
int
|
||
tui_show_frame_info (struct frame_info *fi)
|
||
{
|
||
struct tui_win_info *win_info;
|
||
int locator_changed_p;
|
||
int i;
|
||
|
||
if (fi)
|
||
{
|
||
int start_line, i;
|
||
CORE_ADDR low;
|
||
struct tui_gen_win_info *locator = tui_locator_win_info_ptr ();
|
||
int source_already_displayed;
|
||
struct symtab_and_line sal;
|
||
CORE_ADDR pc;
|
||
|
||
find_frame_sal (fi, &sal);
|
||
|
||
source_already_displayed = sal.symtab != 0
|
||
&& tui_source_is_displayed (symtab_to_fullname (sal.symtab));
|
||
|
||
if (get_frame_pc_if_available (fi, &pc))
|
||
locator_changed_p
|
||
= tui_set_locator_info (get_frame_arch (fi),
|
||
(sal.symtab == 0
|
||
? "??" : symtab_to_fullname (sal.symtab)),
|
||
tui_get_function_from_frame (fi),
|
||
sal.line,
|
||
pc);
|
||
else
|
||
locator_changed_p
|
||
= tui_set_locator_info (get_frame_arch (fi),
|
||
"??", _("<unavailable>"), sal.line, 0);
|
||
|
||
/* If the locator information has not changed, then frame information has
|
||
not changed. If frame information has not changed, then the windows'
|
||
contents will not change. So don't bother refreshing the windows. */
|
||
if (!locator_changed_p)
|
||
return 0;
|
||
|
||
tui_show_locator_content ();
|
||
start_line = 0;
|
||
for (i = 0; i < (tui_source_windows ())->count; i++)
|
||
{
|
||
union tui_which_element *item;
|
||
|
||
win_info = (tui_source_windows ())->list[i];
|
||
|
||
item = &locator->content[0]->which_element;
|
||
if (win_info == TUI_SRC_WIN)
|
||
{
|
||
start_line = (item->locator.line_no -
|
||
(win_info->generic.viewport_height / 2)) + 1;
|
||
if (start_line <= 0)
|
||
start_line = 1;
|
||
}
|
||
else
|
||
{
|
||
if (find_pc_partial_function (get_frame_pc (fi),
|
||
(const char **) NULL,
|
||
&low, NULL) == 0)
|
||
{
|
||
/* There is no symbol available for current PC. There is no
|
||
safe way how to "disassemble backwards". */
|
||
low = get_frame_pc (fi);
|
||
}
|
||
else
|
||
low = tui_get_low_disassembly_address (get_frame_arch (fi),
|
||
low, get_frame_pc (fi));
|
||
}
|
||
|
||
if (win_info == TUI_SRC_WIN)
|
||
{
|
||
struct tui_line_or_address l;
|
||
|
||
l.loa = LOA_LINE;
|
||
l.u.line_no = start_line;
|
||
if (!(source_already_displayed
|
||
&& tui_line_is_displayed (item->locator.line_no,
|
||
win_info, TRUE)))
|
||
tui_update_source_window (win_info, get_frame_arch (fi),
|
||
sal.symtab, l, TRUE);
|
||
else
|
||
{
|
||
l.u.line_no = item->locator.line_no;
|
||
tui_set_is_exec_point_at (l, win_info);
|
||
}
|
||
}
|
||
else
|
||
{
|
||
if (win_info == TUI_DISASM_WIN)
|
||
{
|
||
struct tui_line_or_address a;
|
||
|
||
a.loa = LOA_ADDRESS;
|
||
a.u.addr = low;
|
||
if (!tui_addr_is_displayed (item->locator.addr,
|
||
win_info, TRUE))
|
||
tui_update_source_window (win_info, get_frame_arch (fi),
|
||
sal.symtab, a, TRUE);
|
||
else
|
||
{
|
||
a.u.addr = item->locator.addr;
|
||
tui_set_is_exec_point_at (a, win_info);
|
||
}
|
||
}
|
||
}
|
||
tui_update_exec_info (win_info);
|
||
}
|
||
|
||
return 1;
|
||
}
|
||
else
|
||
{
|
||
locator_changed_p
|
||
= tui_set_locator_info (NULL, NULL, NULL, 0, (CORE_ADDR) 0);
|
||
|
||
if (!locator_changed_p)
|
||
return 0;
|
||
|
||
tui_show_locator_content ();
|
||
for (i = 0; i < (tui_source_windows ())->count; i++)
|
||
{
|
||
win_info = (tui_source_windows ())->list[i];
|
||
tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
|
||
tui_update_exec_info (win_info);
|
||
}
|
||
|
||
return 1;
|
||
}
|
||
}
|
||
|
||
/* Function to initialize gdb commands, for tui window stack
|
||
manipulation. */
|
||
|
||
/* Provide a prototype to silence -Wmissing-prototypes. */
|
||
extern initialize_file_ftype _initialize_tui_stack;
|
||
|
||
void
|
||
_initialize_tui_stack (void)
|
||
{
|
||
add_com ("update", class_tui, tui_update_command,
|
||
_("Update the source window and locator to "
|
||
"display the current execution point.\n"));
|
||
}
|
||
|
||
/* Command to update the display with the current execution point. */
|
||
static void
|
||
tui_update_command (char *arg, int from_tty)
|
||
{
|
||
char cmd[sizeof("frame 0")];
|
||
|
||
strcpy (cmd, "frame 0");
|
||
execute_command (cmd, from_tty);
|
||
}
|