mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2025-01-06 12:09:26 +08:00
223ffa714c
This removes make_cleanup_restore_target_terminal and generally C++-ifies target terminal handling. It changes all target_terminal_* functions to be static members of a new target_terminal class and changes the cleanup to be a scoped_* class. make_cleanup_override_quit_handler is also removed in favor of simply using scoped_restore. Note that there are some files in this patch that I could not compile. Considering that some of the rewrites were automated, and that none of these files involed cleanups, I feel that this is relatively safe. Regression tested by the buildbot. gdb/ChangeLog 2017-09-20 Tom Tromey <tom@tromey.com> * windows-nat.c (get_windows_debug_event, windows_wait) (do_initial_windows_stuff, windows_attach): Update. * utils.c (vwarning, internal_vproblem): Update. (ui_unregister_input_event_handler_cleanup) (prepare_to_handle_input): Remove. (class scoped_input_handler): New. (defaulted_query, prompt_for_continue): Update. * tui/tui-hooks.c (tui_refresh_frame_and_register_information): Update. * top.c (undo_terminal_modifications_before_exit): Update. * target/target.h (target_terminal_init, target_terminal_inferior) (target_terminal_ours): Don't declare. (class target_terminal): New. * target.h (target_terminal_is_inferior, target_terminal_is_ours) (target_terminal_ours_for_output) (make_cleanup_restore_target_terminal): Don't declare. (target_terminal_info): Remove. * target.c (enum terminal_state, terminal_state): Remove. (target_terminal::terminal_state): Define. (target_terminal::init): Rename from target_terminal_init. (target_terminal::inferior): Rename from target_terminal_inferior. (target_terminal::ours): Rename from target_terminal_ours. (target_terminal::ours_for_output): Rename from target_terminal_ours_for_output. (target_terminal::info): New method. (cleanup_restore_target_terminal) (make_cleanup_restore_target_terminal): Remove. * solib.c (handle_solib_event): Update. * remote.c (remote_serial_quit_handler): Update. (remote_terminal_inferior, remote_wait_as): Update. * record-full.c (record_full_wait_1): Update. * nto-procfs.c (procfs_create_inferior): Update. * nat/fork-inferior.c (startup_inferior): Update. * mi/mi-interp.c (mi_new_thread, mi_thread_exit) (mi_record_changed, mi_inferior_added, mi_inferior_appeared) (mi_inferior_exit, mi_inferior_removed, mi_traceframe_changed) (mi_tsv_created, mi_tsv_deleted, mi_tsv_modified) (mi_breakpoint_created, mi_breakpoint_deleted) (mi_breakpoint_modified, mi_on_resume, mi_solib_loaded) (mi_solib_unloaded, mi_command_param_changed, mi_memory_changed) (mi_user_selected_context_changed, report_initial_inferior): Update. * linux-nat.c (linux_nat_attach, linux_nat_terminal_ours) (linux_nat_terminal_inferior): Update. * infrun.c (follow_fork_inferior) (handle_vfork_child_exec_or_exit, do_target_resume) (check_curr_ui_sync_execution_done, handle_inferior_event_1) (handle_signal_stop, maybe_remove_breakpoints, normal_stop): Update. * inflow.c (child_terminal_init, info_terminal_command): Update. * infcmd.c (post_create_inferior, continue_1, prepare_one_step) (attach_command): Update. * infcall.c (call_thread_fsm_should_stop): Update. * gnu-nat.c (gnu_attach): Update. * extension.c (struct active_ext_lang_state) (restore_active_ext_lang): Update. * exceptions.c (print_flush): Update. * event-top.c (async_enable_stdin, default_quit_handler): Update. (struct quit_handler_cleanup_data, restore_quit_handler) (restore_quit_handler_dtor, make_cleanup_override_quit_handler): Remove. * cp-support.c (gdb_demangle): Update. * breakpoint.c (update_inserted_breakpoint_locations) (insert_breakpoint_locations, handle_jit_event) (disable_breakpoints_in_unloaded_shlib): Update. * annotate.c (annotate_breakpoints_invalid) (annotate_frames_invalid): Update. gdb/gdbserver/ChangeLog 2017-09-20 Tom Tromey <tom@tromey.com> * target.c (target_terminal::terminal_state): Define. (target_terminal::init): Rename from target_terminal_init. (target_terminal::inferior): Rename from target_terminal_inferior. (target_terminal::ours): Rename from target_terminal_ours. (target_terminal::ours_for_output, target_terminal::info): New.
272 lines
8.3 KiB
C
272 lines
8.3 KiB
C
/* GDB hooks for TUI.
|
|
|
|
Copyright (C) 2001-2017 Free Software Foundation, Inc.
|
|
|
|
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 "inferior.h"
|
|
#include "command.h"
|
|
#include "bfd.h"
|
|
#include "symfile.h"
|
|
#include "objfiles.h"
|
|
#include "target.h"
|
|
#include "gdbcore.h"
|
|
#include "event-loop.h"
|
|
#include "event-top.h"
|
|
#include "frame.h"
|
|
#include "breakpoint.h"
|
|
#include "ui-out.h"
|
|
#include "top.h"
|
|
#include "observer.h"
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "tui/tui.h"
|
|
#include "tui/tui-hooks.h"
|
|
#include "tui/tui-data.h"
|
|
#include "tui/tui-layout.h"
|
|
#include "tui/tui-io.h"
|
|
#include "tui/tui-regs.h"
|
|
#include "tui/tui-win.h"
|
|
#include "tui/tui-stack.h"
|
|
#include "tui/tui-windata.h"
|
|
#include "tui/tui-winsource.h"
|
|
|
|
#include "gdb_curses.h"
|
|
|
|
/* This redefines CTRL if it is not already defined, so it must come
|
|
after terminal state releated include files like <term.h> and
|
|
"gdb_curses.h". */
|
|
#include "readline/readline.h"
|
|
|
|
static void
|
|
tui_new_objfile_hook (struct objfile* objfile)
|
|
{
|
|
if (tui_active)
|
|
tui_display_main ();
|
|
}
|
|
|
|
/* Prevent recursion of deprecated_register_changed_hook(). */
|
|
static int tui_refreshing_registers = 0;
|
|
|
|
/* Observer for the register_changed notification. */
|
|
|
|
static void
|
|
tui_register_changed (struct frame_info *frame, int regno)
|
|
{
|
|
struct frame_info *fi;
|
|
|
|
/* The frame of the register that was changed may differ from the selected
|
|
frame, but we only want to show the register values of the selected frame.
|
|
And even if the frames differ a register change made in one can still show
|
|
up in the other. So we always use the selected frame here, and ignore
|
|
FRAME. */
|
|
fi = get_selected_frame (NULL);
|
|
if (tui_refreshing_registers == 0)
|
|
{
|
|
tui_refreshing_registers = 1;
|
|
tui_check_data_values (fi);
|
|
tui_refreshing_registers = 0;
|
|
}
|
|
}
|
|
|
|
/* Breakpoint creation hook.
|
|
Update the screen to show the new breakpoint. */
|
|
static void
|
|
tui_event_create_breakpoint (struct breakpoint *b)
|
|
{
|
|
tui_update_all_breakpoint_info ();
|
|
}
|
|
|
|
/* Breakpoint deletion hook.
|
|
Refresh the screen to update the breakpoint marks. */
|
|
static void
|
|
tui_event_delete_breakpoint (struct breakpoint *b)
|
|
{
|
|
tui_update_all_breakpoint_info ();
|
|
}
|
|
|
|
static void
|
|
tui_event_modify_breakpoint (struct breakpoint *b)
|
|
{
|
|
tui_update_all_breakpoint_info ();
|
|
}
|
|
|
|
/* Refresh TUI's frame and register information. This is a hook intended to be
|
|
used to update the screen after potential frame and register changes.
|
|
|
|
REGISTERS_TOO_P controls whether to refresh our register information even
|
|
if frame information hasn't changed. */
|
|
|
|
static void
|
|
tui_refresh_frame_and_register_information (int registers_too_p)
|
|
{
|
|
struct frame_info *fi;
|
|
CORE_ADDR pc;
|
|
int frame_info_changed_p;
|
|
|
|
if (!has_stack_frames ())
|
|
return;
|
|
|
|
target_terminal::scoped_restore_terminal_state term_state;
|
|
target_terminal::ours_for_output ();
|
|
|
|
fi = get_selected_frame (NULL);
|
|
/* Ensure that symbols for this frame are read in. Also, determine
|
|
the source language of this frame, and switch to it if
|
|
desired. */
|
|
if (get_frame_pc_if_available (fi, &pc))
|
|
{
|
|
struct symtab *s;
|
|
|
|
s = find_pc_line_symtab (pc);
|
|
/* elz: This if here fixes the problem with the pc not being
|
|
displayed in the tui asm layout, with no debug symbols. The
|
|
value of s would be 0 here, and select_source_symtab would
|
|
abort the command by calling the 'error' function. */
|
|
if (s)
|
|
select_source_symtab (s);
|
|
}
|
|
|
|
/* Display the frame position (even if there is no symbols or the PC
|
|
is not known). */
|
|
frame_info_changed_p = tui_show_frame_info (fi);
|
|
|
|
/* Refresh the register window if it's visible. */
|
|
if (tui_is_window_visible (DATA_WIN)
|
|
&& (frame_info_changed_p || registers_too_p))
|
|
{
|
|
tui_refreshing_registers = 1;
|
|
tui_check_data_values (fi);
|
|
tui_refreshing_registers = 0;
|
|
}
|
|
}
|
|
|
|
/* Dummy callback for deprecated_print_frame_info_listing_hook which is called
|
|
from print_frame_info. */
|
|
|
|
static void
|
|
tui_dummy_print_frame_info_listing_hook (struct symtab *s,
|
|
int line,
|
|
int stopline,
|
|
int noerror)
|
|
{
|
|
}
|
|
|
|
/* Perform all necessary cleanups regarding our module's inferior data
|
|
that is required after the inferior INF just exited. */
|
|
|
|
static void
|
|
tui_inferior_exit (struct inferior *inf)
|
|
{
|
|
/* Leave the SingleKey mode to make sure the gdb prompt is visible. */
|
|
tui_set_key_mode (TUI_COMMAND_MODE);
|
|
tui_show_frame_info (0);
|
|
tui_display_main ();
|
|
}
|
|
|
|
/* Observer for the before_prompt notification. */
|
|
|
|
static void
|
|
tui_before_prompt (const char *current_gdb_prompt)
|
|
{
|
|
/* This refresh is intended to catch changes to the selected frame following
|
|
a call to "up", "down" or "frame". As such we don't necessarily want to
|
|
refresh registers here unless the frame actually changed by one of these
|
|
commands. Registers will otherwise be refreshed after a normal stop or by
|
|
our tui_register_changed_hook. */
|
|
tui_refresh_frame_and_register_information (/*registers_too_p=*/0);
|
|
}
|
|
|
|
/* Observer for the normal_stop notification. */
|
|
|
|
static void
|
|
tui_normal_stop (struct bpstats *bs, int print_frame)
|
|
{
|
|
/* This refresh is intended to catch changes to the selected frame and to
|
|
registers following a normal stop. */
|
|
tui_refresh_frame_and_register_information (/*registers_too_p=*/1);
|
|
}
|
|
|
|
/* Observers created when installing TUI hooks. */
|
|
static struct observer *tui_bp_created_observer;
|
|
static struct observer *tui_bp_deleted_observer;
|
|
static struct observer *tui_bp_modified_observer;
|
|
static struct observer *tui_inferior_exit_observer;
|
|
static struct observer *tui_before_prompt_observer;
|
|
static struct observer *tui_normal_stop_observer;
|
|
static struct observer *tui_register_changed_observer;
|
|
|
|
/* Install the TUI specific hooks. */
|
|
void
|
|
tui_install_hooks (void)
|
|
{
|
|
/* If this hook is not set to something then print_frame_info will
|
|
assume that the CLI, not the TUI, is active, and will print the frame info
|
|
for us in such a way that we are not prepared to handle. This hook is
|
|
otherwise effectively obsolete. */
|
|
deprecated_print_frame_info_listing_hook
|
|
= tui_dummy_print_frame_info_listing_hook;
|
|
|
|
/* Install the event hooks. */
|
|
tui_bp_created_observer
|
|
= observer_attach_breakpoint_created (tui_event_create_breakpoint);
|
|
tui_bp_deleted_observer
|
|
= observer_attach_breakpoint_deleted (tui_event_delete_breakpoint);
|
|
tui_bp_modified_observer
|
|
= observer_attach_breakpoint_modified (tui_event_modify_breakpoint);
|
|
tui_inferior_exit_observer
|
|
= observer_attach_inferior_exit (tui_inferior_exit);
|
|
tui_before_prompt_observer
|
|
= observer_attach_before_prompt (tui_before_prompt);
|
|
tui_normal_stop_observer
|
|
= observer_attach_normal_stop (tui_normal_stop);
|
|
tui_register_changed_observer
|
|
= observer_attach_register_changed (tui_register_changed);
|
|
}
|
|
|
|
/* Remove the TUI specific hooks. */
|
|
void
|
|
tui_remove_hooks (void)
|
|
{
|
|
deprecated_print_frame_info_listing_hook = 0;
|
|
deprecated_query_hook = 0;
|
|
/* Remove our observers. */
|
|
observer_detach_breakpoint_created (tui_bp_created_observer);
|
|
tui_bp_created_observer = NULL;
|
|
observer_detach_breakpoint_deleted (tui_bp_deleted_observer);
|
|
tui_bp_deleted_observer = NULL;
|
|
observer_detach_breakpoint_modified (tui_bp_modified_observer);
|
|
tui_bp_modified_observer = NULL;
|
|
observer_detach_inferior_exit (tui_inferior_exit_observer);
|
|
tui_inferior_exit_observer = NULL;
|
|
observer_detach_before_prompt (tui_before_prompt_observer);
|
|
tui_before_prompt_observer = NULL;
|
|
observer_detach_normal_stop (tui_normal_stop_observer);
|
|
tui_normal_stop_observer = NULL;
|
|
observer_detach_register_changed (tui_register_changed_observer);
|
|
tui_register_changed_observer = NULL;
|
|
}
|
|
|
|
void
|
|
_initialize_tui_hooks (void)
|
|
{
|
|
/* Install the permanent hooks. */
|
|
observer_attach_new_objfile (tui_new_objfile_hook);
|
|
}
|