Commit: 22b7b0412bceb80ecd5de39a8e05742eb3cbb324 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Révision: 22b7b0412bceb80ecd5de39a8e05742eb3cbb324 (tree)
• l'heure: 2020-07-02 12:21:15
• Auteur: Tom Tromey <tom@trom...>
• Commiter: Tom Tromey

Message de Log

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 <[e-mail]>

* 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.

Change Summary

• modified: gdb/ChangeLog
• modified: gdb/tui/tui-regs.c
• modified: gdb/tui/tui-regs.h

Modification

--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
 2020-07-01  Tom Tromey  <[e-mail]>
 
+	* 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.
+
[phone]  Tom Tromey  <[e-mail]>
+
 	* tui/tui-regs.c (tui_data_window::show_register_group): Remove
 	useless "if".
 

--- 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)

--- 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;
 };