Change tui_addr_is_displayed into a method

This changes tui_addr_is_displayed to be a method on
tui_disasm_window, now that it is obvious that it can only be called
for this type.

gdb/ChangeLog
2019-08-15  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.h (tui_addr_is_displayed): Don't declare.
	* tui/tui-winsource.c (tui_addr_is_displayed): Move to
	tui-disasm.c.
	* tui/tui-disasm.h (struct tui_disasm_window) <addr_is_displayed>:
	Declare.
	* tui/tui-disasm.c (tui_disasm_window::addr_is_displayed): New
	method.
	(tui_disasm_window::maybe_update): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b0da5a1a3a848d8e896f84955bd79ae9ff767fe5..6650f58aaff1434034e32889df2f8e03f32953a5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2019-08-15  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-winsource.h (tui_addr_is_displayed): Don't declare.
+       * tui/tui-winsource.c (tui_addr_is_displayed): Move to
+       tui-disasm.c.
+       * tui/tui-disasm.h (struct tui_disasm_window) <addr_is_displayed>:
+       Declare.
+       * tui/tui-disasm.c (tui_disasm_window::addr_is_displayed): New
+       method.
+       (tui_disasm_window::maybe_update): Update.
+
 2019-08-15  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-winsource.h (struct tui_source_window_base)

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index fcb33bccfd7e66532ce654991bfccb4088fa36fe..e55f35da214d5b0b0b9baf6bcd6edbf06c2f48ec 100644 (file)
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -381,6 +381,24 @@ tui_disasm_window::location_matches_p (struct bp_location *loc, int line_no)
          && content[line_no].line_or_addr.u.addr == loc->address);
 }
 
+bool
+tui_disasm_window::addr_is_displayed (CORE_ADDR addr) const
+{
+  bool is_displayed = false;
+  int threshold = SCROLL_THRESHOLD;
+
+  int i = 0;
+  while (i < content.size () - threshold && !is_displayed)
+    {
+      is_displayed
+       = (content[i].line_or_addr.loa == LOA_ADDRESS
+          && content[i].line_or_addr.u.addr == addr);
+      i++;
+    }
+
+  return is_displayed;
+}
+
 void
 tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal,
                                 int line_no, CORE_ADDR addr)
@@ -402,7 +420,7 @@ tui_disasm_window::maybe_update (struct frame_info *fi, symtab_and_line sal,
 
   a.loa = LOA_ADDRESS;
   a.u.addr = low;
-  if (!tui_addr_is_displayed (addr, this, TRUE))
+  if (!addr_is_displayed (addr))
     tui_update_source_window (this, get_frame_arch (fi),
                              sal.symtab, a, TRUE);
   else

diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
index 20bc4290ffc1ac22f05828d93320a677e68e5d1c..1b51e09f5e0b130a7c0a06e5b465147183f0c2c0 100644 (file)
--- a/gdb/tui/tui-disasm.h
+++ b/gdb/tui/tui-disasm.h
@@ -51,6 +51,11 @@ struct tui_disasm_window : public tui_source_window_base
 protected:
 
   void do_scroll_vertical (int num_to_scroll) override;
+
+private:
+  /* Answer whether a particular line number or address is displayed
+     in the current source window.  */
+  bool addr_is_displayed (CORE_ADDR addr) const;
 };
 
 extern enum tui_status tui_set_disassem_content (tui_source_window_base *,

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 1b2b4393fd90ec29df9770bba80dad6731da912d..e8e7061d0f29eed2704dff7a9ea38bd83275d12d 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -668,31 +668,3 @@ tui_line_is_displayed (int line,
 
   return is_displayed;
 }
-
-
-/* Answer whether a particular line number or address is displayed
-   in the current source window.  */
-int
-tui_addr_is_displayed (CORE_ADDR addr, 
-                      struct tui_source_window_base *win_info,
-                      int check_threshold)
-{
-  int is_displayed = FALSE;
-  int i, threshold;
-
-  if (check_threshold)
-    threshold = SCROLL_THRESHOLD;
-  else
-    threshold = 0;
-  i = 0;
-  while (i < win_info->content.size () - threshold
-        && !is_displayed)
-    {
-      is_displayed
-       = win_info->content[i].line_or_addr.loa == LOA_ADDRESS
-         && win_info->content[i].line_or_addr.u.addr == addr;
-      i++;
-    }
-
-  return is_displayed;
-}

diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index f2fd1eb1b0bf0b6df8c5d0ae9fa8c2a9a4411d72..b03ba2f5d85989a56f3ea55b20eab2c8582ef186 100644 (file)
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -177,9 +177,6 @@ extern void tui_alloc_source_buffer (struct tui_source_window_base *);
 extern int tui_line_is_displayed (int,
                                  struct tui_source_window_base *,
                                  int);
-extern int tui_addr_is_displayed (CORE_ADDR,
-                                 struct tui_source_window_base *,
-                                 int);
 
 
 /* Constant definitions. */