mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-27 04:52:05 +08:00
76727919ce
This converts observers from using a special source-generating script to be plain C++. This version of the patch takes advantage of C++11 by using std::function and variadic templates; incorporates Pedro's patches; and renames the header file to "observable.h" (this change eliminates the need for a clean rebuild). Note that Pedro's patches used a template lambda in tui-hooks.c, but this failed to compile on some buildbot instances (presumably due to differing C++ versions); I replaced this with an ordinary template function. Regression tested on the buildbot. gdb/ChangeLog 2018-03-19 Pedro Alves <palves@redhat.com> Tom Tromey <tom@tromey.com> * unittests/observable-selftests.c: New file. * common/observable.h: New file. * observable.h: New file. * ada-lang.c, ada-tasks.c, agent.c, aix-thread.c, annotate.c, arm-tdep.c, auto-load.c, auxv.c, break-catch-syscall.c, breakpoint.c, bsd-uthread.c, cli/cli-interp.c, cli/cli-setshow.c, corefile.c, dummy-frame.c, event-loop.c, event-top.c, exec.c, extension.c, frame.c, gdbarch.c, guile/scm-breakpoint.c, infcall.c, infcmd.c, inferior.c, inflow.c, infrun.c, jit.c, linux-tdep.c, linux-thread-db.c, m68klinux-tdep.c, mi/mi-cmd-break.c, mi/mi-interp.c, mi/mi-main.c, objfiles.c, ppc-linux-nat.c, ppc-linux-tdep.c, printcmd.c, procfs.c, python/py-breakpoint.c, python/py-finishbreakpoint.c, python/py-inferior.c, python/py-unwind.c, ravenscar-thread.c, record-btrace.c, record-full.c, record.c, regcache.c, remote.c, riscv-tdep.c, sol-thread.c, solib-aix.c, solib-spu.c, solib.c, spu-multiarch.c, spu-tdep.c, stack.c, symfile-mem.c, symfile.c, symtab.c, thread.c, top.c, tracepoint.c, tui/tui-hooks.c, tui/tui-interp.c, valops.c: Update all users. * tui/tui-hooks.c (tui_bp_created_observer) (tui_bp_deleted_observer, tui_bp_modified_observer) (tui_inferior_exit_observer, tui_before_prompt_observer) (tui_normal_stop_observer, tui_register_changed_observer): Remove. (tui_observers_token): New global. (attach_or_detach, tui_attach_detach_observers): New functions. (tui_install_hooks, tui_remove_hooks): Use tui_attach_detach_observers. * record-btrace.c (record_btrace_thread_observer): Remove. (record_btrace_thread_observer_token): New global. * observer.sh: Remove. * observer.c: Rename to observable.c. * observable.c (namespace gdb_observers): Define new objects. (observer_debug): Move into gdb_observers namespace. (struct observer, struct observer_list, xalloc_observer_list_node) (xfree_observer_list_node, generic_observer_attach) (generic_observer_detach, generic_observer_notify): Remove. (_initialize_observer): Update. Don't include observer.inc. * Makefile.in (generated_files): Remove observer.h, observer.inc. (clean mostlyclean): Likewise. (observer.h, observer.inc): Remove targets. (SUBDIR_UNITTESTS_SRCS): Add observable-selftests.c. (COMMON_SFILES): Use observable.c, not observer.c. * .gitignore: Remove observer.h. gdb/doc/ChangeLog 2018-03-19 Tom Tromey <tom@tromey.com> * observer.texi: Remove. gdb/testsuite/ChangeLog 2018-03-19 Tom Tromey <tom@tromey.com> * gdb.gdb/observer.exp: Remove.
275 lines
7.9 KiB
C
275 lines
7.9 KiB
C
/* GDB hooks for TUI.
|
|
|
|
Copyright (C) 2001-2018 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 "observable.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);
|
|
}
|
|
|
|
/* Token associated with observers registered while TUI hooks are
|
|
installed. */
|
|
static const gdb::observers::token tui_observers_token;
|
|
|
|
/* Attach or detach a single observer, according to ATTACH. */
|
|
|
|
template<typename T>
|
|
static void
|
|
attach_or_detach (T &observable, typename T::func_type func, bool attach)
|
|
{
|
|
if (attach)
|
|
observable.attach (func, tui_observers_token);
|
|
else
|
|
observable.detach (tui_observers_token);
|
|
}
|
|
|
|
/* Attach or detach TUI observers, according to ATTACH. */
|
|
|
|
static void
|
|
tui_attach_detach_observers (bool attach)
|
|
{
|
|
attach_or_detach (gdb::observers::breakpoint_created,
|
|
tui_event_create_breakpoint, attach);
|
|
attach_or_detach (gdb::observers::breakpoint_deleted,
|
|
tui_event_delete_breakpoint, attach);
|
|
attach_or_detach (gdb::observers::breakpoint_modified,
|
|
tui_event_modify_breakpoint, attach);
|
|
attach_or_detach (gdb::observers::inferior_exit,
|
|
tui_inferior_exit, attach);
|
|
attach_or_detach (gdb::observers::before_prompt,
|
|
tui_before_prompt, attach);
|
|
attach_or_detach (gdb::observers::normal_stop,
|
|
tui_normal_stop, attach);
|
|
attach_or_detach (gdb::observers::register_changed,
|
|
tui_register_changed, attach);
|
|
}
|
|
|
|
/* 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_attach_detach_observers (true);
|
|
}
|
|
|
|
/* Remove the TUI specific hooks. */
|
|
void
|
|
tui_remove_hooks (void)
|
|
{
|
|
deprecated_print_frame_info_listing_hook = 0;
|
|
deprecated_query_hook = 0;
|
|
|
|
/* Remove our observers. */
|
|
tui_attach_detach_observers (false);
|
|
}
|
|
|
|
void
|
|
_initialize_tui_hooks (void)
|
|
{
|
|
/* Install the permanent hooks. */
|
|
gdb::observers::new_objfile.attach (tui_new_objfile_hook);
|
|
}
|