mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
f237f998d1
The locator window, or status window as it is sometimes called is handled differently to all the other windows. The reason for this is that the class representing this window (tui_locator_window) does two jobs, first this class represents a window just like any other that has space on the screen and fills the space with content. The second job is that this class serves as a storage area to hold information about the current location that the TUI windows represent, so the class has members like 'addr' and 'line_no', for example which are used within this class, and others when they want to know which line/address the TUI windows should be showing to the user. Because of this dual purpose we must always have an instance of the tui_locator_window so that there is somewhere to store this location information. The result of this is that the locator window must never be deleted like other windows, which results in some special case code. In this patch I propose splitting the two roles of the tui_locator_window class. The tui_locator_window class will retain just its window drawing parts, and will be treated just like any other window. This should allow all special case code for this window to be deleted. The other role, that of tracking the current tui location will be moved into a new class (tui_location_tracker), of which there will be a single global instance. All of the places where we previously use the locator window to get location information will now be updated to get this from the tui_location_tracker. There should be no user visible changes after this commit. gdb/ChangeLog: * Makefile.in (SUBDIR_TUI_SRCS): Add tui/tui-location.c. (HFILES_NO_SRCDIR): Add tui/tui-location.h. * tui/tui-data.h (TUI_STATUS_WIN): Define. (tui_locator_win_info_ptr): Delete declaration. * tui/tui-disasm.c: Add 'tui/tui-location.h' include. (tui_disasm_window::set_contents): Fetch state from tui_location global. (tui_get_begin_asm_address): Likewise. * tui/tui-layout.c (tui_apply_current_layout): Remove special case for locator window. (get_locator_window): Delete. (initialize_known_windows): Treat locator window just like all the rest. * tui/tui-source.c: Add 'tui/tui-location.h' include. (tui_source_window::set_contents): Fetch state from tui_location global. (tui_source_window::showing_source_p): Likewise. * tui/tui-stack.c: Add 'tui/tui-location.h' include. (_locator): Delete. (tui_locator_win_info_ptr): Delete. (tui_locator_window::make_status_line): Fetch state from tui_location global. (tui_locator_window::rerender): Remove check of 'handle', reindent function body. (tui_locator_window::set_locator_fullname): Delete. (tui_locator_window::set_locator_info): Delete. (tui_update_locator_fullname): Delete. (tui_show_frame_info): Likewise. (tui_show_locator_content): Access window through TUI_STATUS_WIN. * tui/tui-stack.h (tui_locator_window::set_locator_info): Moved to tui/tui-location.h and renamed to tui_location_tracker::set_location. (tui_locator_window::set_locator_fullname): Moved to tui/tui-location.h and renamed to tui_location_tracker::set_fullname. (tui_locator_window::full_name): Delete. (tui_locator_window::proc_name): Delete. (tui_locator_window::line_no): Delete. (tui_locator_window::addr): Delete. (tui_locator_window::gdbarch): Delete. (tui_update_locator_fullname): Delete declaration. * tui/tui-wingeneral.c (tui_refresh_all): Removed special handling for locator window. * tui/tui-winsource.c: Add 'tui/tui-location.h' include. (tui_display_main): Call function on tui_location directly. * tui/tui.h (enum tui_win_type): Add STATUS_WIN. * tui/tui-location.c: New file. * tui/tui-location.h: New file.
82 lines
2.1 KiB
C
82 lines
2.1 KiB
C
/* Copyright (C) 2021 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 "tui/tui.h"
|
|
#include "tui/tui-stack.h"
|
|
#include "tui/tui-data.h"
|
|
#include "tui/tui-location.h"
|
|
#include "symtab.h"
|
|
#include "source.h"
|
|
|
|
/* See tui/tui-location.h. */
|
|
|
|
tui_location_tracker tui_location;
|
|
|
|
/* See tui/tui-location.h. */
|
|
|
|
bool
|
|
tui_location_tracker::set_location (struct gdbarch *gdbarch,
|
|
const struct symtab_and_line &sal,
|
|
const char *procname)
|
|
{
|
|
gdb_assert (procname != nullptr);
|
|
|
|
bool location_changed_p = set_fullname (sal.symtab);
|
|
location_changed_p |= procname != m_proc_name;
|
|
location_changed_p |= sal.line != m_line_no;
|
|
location_changed_p |= sal.pc != m_addr;
|
|
location_changed_p |= gdbarch != m_gdbarch;
|
|
|
|
m_proc_name = procname;
|
|
m_line_no = sal.line;
|
|
m_addr = sal.pc;
|
|
m_gdbarch = gdbarch;
|
|
|
|
if (location_changed_p)
|
|
tui_show_locator_content ();
|
|
|
|
return location_changed_p;
|
|
}
|
|
|
|
/* See tui/tui-location.h. */
|
|
|
|
bool
|
|
tui_location_tracker::set_location (struct symtab *symtab)
|
|
{
|
|
bool location_changed_p = set_fullname (symtab);
|
|
|
|
if (location_changed_p)
|
|
tui_show_locator_content ();
|
|
|
|
return location_changed_p;
|
|
}
|
|
|
|
/* See tui/tui-location.h. */
|
|
|
|
bool
|
|
tui_location_tracker::set_fullname (struct symtab *symtab)
|
|
{
|
|
const char *fullname = (symtab == nullptr
|
|
? "??"
|
|
: symtab_to_fullname (symtab));
|
|
bool location_changed_p = fullname != m_full_name;
|
|
m_full_name = std::string (fullname);
|
|
|
|
return location_changed_p;
|
|
}
|