diff options
| author | Tom Tromey <tom@tromey.com> | 2019-06-26 15:49:00 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2019-07-17 12:18:54 -0600 |
| commit | baff0c28b83bd1ad7949d07b78fdb85ad6be49a5 (patch) | |
| tree | 7e3da6262f4adf6ac57c8f85eb8f664a388cea4b /gdb/tui/tui-regs.c | |
| parent | 3b23c5f2662d3240cdc586d3d2e5fb6eb8cba4c7 (diff) | |
| download | gdb-baff0c28b83bd1ad7949d07b78fdb85ad6be49a5.zip gdb-baff0c28b83bd1ad7949d07b78fdb85ad6be49a5.tar.gz gdb-baff0c28b83bd1ad7949d07b78fdb85ad6be49a5.tar.bz2 | |
Introduce tui_data_window::first_reg_element_no_inline
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.
Diffstat (limited to 'gdb/tui/tui-regs.c')
| -rw-r--r-- | gdb/tui/tui-regs.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 03e9149..d005fe3 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -103,16 +103,13 @@ tui_data_window::line_from_reg_element_no (int element_no) const 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 -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) - <= TUI_DATA_WIN->regs_content.size ()) - return (((line_no + 1) * TUI_DATA_WIN->regs_column_count) - - TUI_DATA_WIN->regs_column_count); + if (line_no * regs_column_count <= regs_content.size ()) + return ((line_no + 1) * regs_column_count) - regs_column_count; else return (-1); } @@ -362,7 +359,8 @@ tui_display_reg_element_at_line (int start_element_no, display at. */ if (start_line_no > first_line_on_last_page) 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); } @@ -399,7 +397,7 @@ tui_display_registers_from_line (int line_no, else 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 ()) tui_display_reg_element_at_line (element_no, line); else |