espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-30 00:52:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Introduce tui_data_window::display_reg_element_at_line method

Browse Source 
This changes tui_display_reg_element_at_line to be a method on
tui_data_window, allowing for the removal of some uses of the
TUI_DATA_WIN global.

gdb/ChangeLog
2019-07-17  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.c (tui_data_window::display_reg_element_at_line):
	Rename from tui_display_reg_element_at_line.
	(tui_data_window::display_registers_from_line): Update.
	* tui/tui-data.h (struct tui_data_window)
	<display_reg_element_at_line>: New method.
This commit is contained in:
Tom Tromey
2019-06-26 16:15:46 -06:00
parent 517e9505fa
commit aca2dd1647
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-regs.c (tui_data_window::display_reg_element_at_line):
Rename from tui_display_reg_element_at_line.
(tui_data_window::display_registers_from_line): Update.
* tui/tui-data.h (struct tui_data_window)
<display_reg_element_at_line>: New method.
2019-07-17 Tom Tromey <tom@tromey.com> 2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-regs.h (tui_display_registers_from) * tui/tui-regs.h (tui_display_registers_from)

6
gdb/tui/tui-data.h
View File

@ -535,6 +535,12 @@ protected:
/* Return the index of the first element displayed. If none are /* Return the index of the first element displayed. If none are
displayed, then return -1. */ displayed, then return -1. */
int first_data_item_displayed (); int first_data_item_displayed ();
/* Display the registers in the content from 'start_element_no' on
'start_line_no' until the end of the register content or the end
of the display height. This function checks that we won't
display off the end of the register display. */
void display_reg_element_at_line (int start_element_no, int start_line_no);
}; };
struct tui_cmd_window : public tui_win_info struct tui_cmd_window : public tui_win_info

24
gdb/tui/tui-regs.c
View File

@ -326,16 +326,13 @@ tui_data_window::display_registers_from (int start_element_no)
} }
} }
/* See tui-data.h. */
/* Function to display the registers in the content from void
'start_element_no' on 'start_line_no' until the end of the register tui_data_window::display_reg_element_at_line (int start_element_no,
content or the end of the display height. This function checks
that we won't display off the end of the register display. */
static void
tui_display_reg_element_at_line (int start_element_no,
int start_line_no) int start_line_no)
{ {
if (!TUI_DATA_WIN->regs_content.empty ()) if (!regs_content.empty ())
{ {
int element_no = start_element_no; int element_no = start_element_no;
@ -343,9 +340,8 @@ tui_display_reg_element_at_line (int start_element_no,
{ {
int last_line_no, first_line_on_last_page; int last_line_no, first_line_on_last_page;
last_line_no = TUI_DATA_WIN->last_regs_line_no (); last_line_no = last_regs_line_no ();
first_line_on_last_page first_line_on_last_page = last_line_no - (height - 2);
= last_line_no - (TUI_DATA_WIN->height - 2);
if (first_line_on_last_page < 0) if (first_line_on_last_page < 0)
first_line_on_last_page = 0; first_line_on_last_page = 0;
@ -353,11 +349,9 @@ tui_display_reg_element_at_line (int start_element_no,
registers, adjust what element to really start the registers, adjust what element to really start the
display at. */ display at. */
if (start_line_no > first_line_on_last_page) if (start_line_no > first_line_on_last_page)
element_no element_no = first_reg_element_no_inline (first_line_on_last_page);
= (TUI_DATA_WIN->first_reg_element_no_inline
(first_line_on_last_page));
} }
TUI_DATA_WIN->display_registers_from (element_no); display_registers_from (element_no);
} }
} }
@ -387,7 +381,7 @@ tui_data_window::display_registers_from_line (int line_no)
element_no = first_reg_element_no_inline (line_no); element_no = first_reg_element_no_inline (line_no);
if (element_no < regs_content.size ()) if (element_no < regs_content.size ())
tui_display_reg_element_at_line (element_no, line_no); display_reg_element_at_line (element_no, line_no);
else else
line_no = (-1); line_no = (-1);