Rename tui_data_item_window::item_no

tui_data_item_window::item_no is misnamed -- it only can be used for a
register, but it references a "display" number as well.  (Based on
other comments I've seen in the past -- most since deleted -- I think
there were plans at one point to display variables in this window as
well.  However, this was never implemented.)

This patch renames this member to be more correct.

gdb/ChangeLog
2020-07-01  Tom Tromey  <tom@tromey.com>

	* tui/tui-regs.c (tui_data_window::show_register_group)
	(tui_data_window::check_register_values): Update.
	* tui/tui-regs.h (struct tui_data_item_window) <regno>: Rename
	from item_no.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index eeb8bdc0559129697bf183e6db6e5ebbb2161915..22910344560969e1bf46311618afbbff05d31718 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-07-01  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-regs.c (tui_data_window::show_register_group)
+       (tui_data_window::check_register_values): Update.
+       * tui/tui-regs.h (struct tui_data_item_window) <regno>: Rename
+       from item_no.
+
 2020-07-01  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-regs.c (tui_data_window::show_register_group): Remove

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 51fc475beda879d1ce97b2258ca08be0605cbd58..fcabe73a5ea026d48e8f5ee9f5d5d922375be0d5 100644 (file)
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -259,7 +259,7 @@ tui_data_window::show_register_group (struct reggroup *group,
       data_item_win = &m_regs_content[pos];
       if (!refresh_values_only)
        {
-         data_item_win->item_no = regnum;
+         data_item_win->regno = regnum;
          data_item_win->highlight = false;
        }
       tui_get_register (frame, data_item_win, regnum, 0);
@@ -486,7 +486,7 @@ tui_data_window::check_register_values (struct frame_info *frame)
          was_hilighted = data_item_win.highlight;
 
          tui_get_register (frame, &data_item_win,
-                           data_item_win.item_no,
+                           data_item_win.regno,
                            &data_item_win.highlight);
 
          if (data_item_win.highlight || was_hilighted)

diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 7acc0c7bd62d6ccc1c5d32a0897feb1b40ee5dd4..8b5e941a0a0a61b8bb2a47cd2a3c9f28d0788c74 100644 (file)
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -48,8 +48,8 @@ struct tui_data_item_window : public tui_gen_win_info
     return 1;
   }
 
-  /* The register number, or data display number.  */
-  int item_no = -1;
+  /* The register number.  */
+  int regno = -1;
   bool highlight = false;
   std::string content;
 };