From baff0c28b83bd1ad7949d07b78fdb85ad6be49a5 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 26 Jun 2019 15:49:00 -0600 Subject: [PATCH] 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 * 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) : New method. --- gdb/ChangeLog | 11 +++++++++++ gdb/tui/tui-data.h | 4 ++++ gdb/tui/tui-regs.c | 16 +++++++--------- gdb/tui/tui-regs.h | 1 - 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9177dfd4253..813c86d4c05 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2019-07-17 Tom Tromey + + * 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) + : New method. + 2019-07-17 Tom Tromey * tui/tui-windata.c (tui_display_data_from) diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 081d0dfa449..676345c528a 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -499,6 +499,10 @@ struct tui_data_window : public tui_win_info elements there are, -1 is returned. */ 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: void do_scroll_vertical (int num_to_scroll) override; diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index 03e91496b0f..d005fe36c23 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 diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h index f6ed8628f2a..866af458e10 100644 --- a/gdb/tui/tui-regs.h +++ b/gdb/tui/tui-regs.h @@ -29,6 +29,5 @@ extern void tui_show_registers (struct reggroup *group); extern void tui_display_registers_from (int); extern int tui_display_registers_from_line (int, int); extern int tui_first_reg_element_inline (int); -extern int tui_first_reg_element_no_inline (int lineno); #endif /* TUI_TUI_REGS_H */ -- 2.30.2