forked from Imagelibrary/binutils-gdb
bbcbf914a6
When I replaced TUI's frame_changed hook to fix PR tui/13378 I assumed that there's no reason to refresh register information following a call to "up", "down" or "frame". This assumption was made to fix the problem of refreshing frame information twice following a sync-execution normal stop (once in tui_normal_stop and then in tui_before_prompt) -- the second refresh removing any highlights made by the first. I was wrong about that -- GDB's snapshot of register information is per-frame, and when the frame changes, registers do too (most prominently the %rip and %rsp registers). So e.g. GDB 7.8 would highlight such register changes after invoking "up", "down" or "frame", and current GDB does not. To fix this regression, this patch adds another (sufficient) condition for refreshing register information: in tui_refresh_frame_and_register_information, always refresh register information if frame information has changed. This makes register information get refreshed following a call to "up", "down" or "frame" while still avoiding the "double refresh" issue following a normal stop. This condition may seem to obsolete the existing registers_too_p parameter, but it does not: following a normal stop, it is possible that registers may have changed while frame information had not. We could be on the exact same PC with different register values. The new condition would not catch such a case, but the registers_too_p condition will. So both conditions seem necessary (and either one is sufficient). gdb/ChangeLog: * tui/tui-hooks.c (tui_refresh_frame_and_register_information): Update commentary. Always refresh the registers when frame information has changed. * tui/tui-stack.c (tui_show_frame_info): Update commentary. Change return type to int. Return 1 if frame information has changed, 1 otherwise. (tui_before_prompt): Update commentary. * tui/tui-stack.h (tui_show_frame_info): Change return type to int.
293 lines
8.4 KiB
C
293 lines
8.4 KiB
C
/* GDB hooks for TUI.
|
|
|
|
Copyright (C) 2001-2015 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"
|
|
|
|
int tui_target_has_run = 0;
|
|
|
|
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;
|
|
|
|
static void
|
|
tui_register_changed_hook (int regno)
|
|
{
|
|
struct frame_info *fi;
|
|
|
|
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 ();
|
|
}
|
|
|
|
/* Called when a command is about to proceed the inferior. */
|
|
|
|
static void
|
|
tui_about_to_proceed (void)
|
|
{
|
|
/* Leave tui mode (optional). */
|
|
#if 0
|
|
if (tui_active)
|
|
{
|
|
target_terminal_ours ();
|
|
endwin ();
|
|
target_terminal_inferior ();
|
|
}
|
|
#endif
|
|
tui_target_has_run = 1;
|
|
}
|
|
|
|
/* 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;
|
|
struct cleanup *old_chain;
|
|
int frame_info_changed_p;
|
|
|
|
if (!has_stack_frames ())
|
|
return;
|
|
|
|
old_chain = make_cleanup_restore_target_terminal ();
|
|
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;
|
|
}
|
|
|
|
do_cleanups (old_chain);
|
|
}
|
|
|
|
/* 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_about_to_proceed_observer;
|
|
static struct observer *tui_before_prompt_observer;
|
|
static struct observer *tui_normal_stop_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_about_to_proceed_observer
|
|
= observer_attach_about_to_proceed (tui_about_to_proceed);
|
|
tui_before_prompt_observer
|
|
= observer_attach_before_prompt (tui_before_prompt);
|
|
tui_normal_stop_observer
|
|
= observer_attach_normal_stop (tui_normal_stop);
|
|
|
|
deprecated_register_changed_hook = tui_register_changed_hook;
|
|
}
|
|
|
|
/* Remove the TUI specific hooks. */
|
|
void
|
|
tui_remove_hooks (void)
|
|
{
|
|
deprecated_print_frame_info_listing_hook = 0;
|
|
deprecated_query_hook = 0;
|
|
deprecated_register_changed_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_about_to_proceed (tui_about_to_proceed_observer);
|
|
tui_about_to_proceed_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;
|
|
}
|
|
|
|
void _initialize_tui_hooks (void);
|
|
|
|
void
|
|
_initialize_tui_hooks (void)
|
|
{
|
|
/* Install the permanent hooks. */
|
|
observer_attach_new_objfile (tui_new_objfile_hook);
|
|
}
|