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

Introduce tui_data_window::first_reg_element_no_inline

Browse Source 
This changes tui_first_reg_element_no_inline to be a method on
tui_data_window.  This again moves uses of the TUI_DATA_WIN global
from this function into other functions that are already using the
global.

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

	* tui/tui-regs.h (tui_first_reg_element_no_inline): Don't
	declare.
	* tui/tui-regs.c (tui_data_window::first_reg_element_no_inline):
	Rename from tui_first_reg_element_no_inline.
	(tui_display_reg_element_at_line)
	(tui_display_registers_from_line): Update.
	* tui/tui-data.h (struct tui_data_window)
	<first_reg_element_no_inline>: New method.
This commit is contained in:
Tom Tromey
2019-06-26 15:49:00 -06:00
parent 3b23c5f266
commit baff0c28b8
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-regs.h (tui_first_reg_element_no_inline): Don't
declare.
* tui/tui-regs.c (tui_data_window::first_reg_element_no_inline):
Rename from tui_first_reg_element_no_inline.
(tui_display_reg_element_at_line)
(tui_display_registers_from_line): Update.
* tui/tui-data.h (struct tui_data_window)
<first_reg_element_no_inline>: New method.
2019-07-17 Tom Tromey <tom@tromey.com> 2019-07-17 Tom Tromey <tom@tromey.com>
* tui/tui-windata.c (tui_display_data_from) * tui/tui-windata.c (tui_display_data_from)

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

@ -499,6 +499,10 @@ struct tui_data_window : public tui_win_info
elements there are, -1 is returned. */ elements there are, -1 is returned. */
int line_from_reg_element_no (int element_no) const; int line_from_reg_element_no (int element_no) const;
/* Answer the index of the first element in line_no. If line_no is
past the register area (-1) is returned. */
int first_reg_element_no_inline (int line_no) const;
protected: protected:
void do_scroll_vertical (int num_to_scroll) override; void do_scroll_vertical (int num_to_scroll) override;

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

@ -103,16 +103,13 @@ tui_data_window::line_from_reg_element_no (int element_no) const
return (-1); return (-1);
} }
/* See tui-data.h. */
/* Answer the index of the first element in line_no. If line_no is
past the register area (-1) is returned. */
int int
tui_first_reg_element_no_inline (int line_no) tui_data_window::first_reg_element_no_inline (int line_no) const
{ {
if ((line_no * TUI_DATA_WIN->regs_column_count) if (line_no * regs_column_count <= regs_content.size ())
<= TUI_DATA_WIN->regs_content.size ()) return ((line_no + 1) * regs_column_count) - regs_column_count;
return (((line_no + 1) * TUI_DATA_WIN->regs_column_count)
- TUI_DATA_WIN->regs_column_count);
else else
return (-1); return (-1);
} }
@ -362,7 +359,8 @@ tui_display_reg_element_at_line (int start_element_no,
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
= tui_first_reg_element_no_inline (first_line_on_last_page); = (TUI_DATA_WIN->first_reg_element_no_inline
(first_line_on_last_page));
} }
tui_display_registers_from (element_no); tui_display_registers_from (element_no);
} }
@ -399,7 +397,7 @@ tui_display_registers_from_line (int line_no,
else else
line = line_no; line = line_no;
element_no = tui_first_reg_element_no_inline (line); element_no = TUI_DATA_WIN->first_reg_element_no_inline (line);
if (element_no < TUI_DATA_WIN->regs_content.size ()) if (element_no < TUI_DATA_WIN->regs_content.size ())
tui_display_reg_element_at_line (element_no, line); tui_display_reg_element_at_line (element_no, line);
else else

1
gdb/tui/tui-regs.h
View File

@ -29,6 +29,5 @@ extern void tui_show_registers (struct reggroup *group);
extern void tui_display_registers_from (int); extern void tui_display_registers_from (int);
extern int tui_display_registers_from_line (int, int); extern int tui_display_registers_from_line (int, int);
extern int tui_first_reg_element_inline (int); extern int tui_first_reg_element_inline (int);
extern int tui_first_reg_element_no_inline (int lineno);
#endif /* TUI_TUI_REGS_H */ #endif /* TUI_TUI_REGS_H */