Remove target_has_memory macro

This removes the target_has_memory object-like macro, replacing it
with the underlying function.

gdb/ChangeLog
2020-09-28  Tom Tromey  <tom@tromey.com>

	* target.c (target_has_memory): Rename from target_has_memory_1.
	* tui/tui-regs.c (tui_data_window::show_registers): Update.
	* thread.c (scoped_restore_current_thread::restore)
	(scoped_restore_current_thread::scoped_restore_current_thread):
	Update.
	* frame.c (get_current_frame, has_stack_frames): Update.
	* target.h (target_has_memory): Remove macro.
	(target_has_memory): Rename from target_has_memory_1.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9bdd1f2a8e96966897078008ce1472adda8931a9..1e2bee69b4ba9e31e47640191a2ac06d6662b2de 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+2020-09-28  Tom Tromey  <tom@tromey.com>
+
+       * target.c (target_has_memory): Rename from target_has_memory_1.
+       * tui/tui-regs.c (tui_data_window::show_registers): Update.
+       * thread.c (scoped_restore_current_thread::restore)
+       (scoped_restore_current_thread::scoped_restore_current_thread):
+       Update.
+       * frame.c (get_current_frame, has_stack_frames): Update.
+       * target.h (target_has_memory): Remove macro.
+       (target_has_memory): Rename from target_has_memory_1.
+
 2020-09-28  Tom Tromey  <tom@tromey.com>
 
        * target.c (target_has_all_memory_1): Remove.

diff --git a/gdb/frame.c b/gdb/frame.c
index 0b708e66827217dfced98cdb72008674cf8dd870..113fe8ace400c530d1937798550f228b86c467cd 100644 (file)
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1657,7 +1657,7 @@ get_current_frame (void)
     error (_("No registers."));
   if (!target_has_stack)
     error (_("No stack."));
-  if (!target_has_memory)
+  if (!target_has_memory ())
     error (_("No memory."));
   /* Traceframes are effectively a substitute for the live inferior.  */
   if (get_traceframe_number () < 0)
@@ -1692,7 +1692,7 @@ static struct frame_info *selected_frame;
 bool
 has_stack_frames ()
 {
-  if (!target_has_registers || !target_has_stack || !target_has_memory)
+  if (!target_has_registers || !target_has_stack || !target_has_memory ())
     return false;
 
   /* Traceframes are effectively a substitute for the live inferior.  */

diff --git a/gdb/target.c b/gdb/target.c
index 6596efa6984ad02b99e9d8e8fa11f9bfebbb694b..3bcd6cbc91f895e7384de98dc652a323f3ef93da 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -170,7 +170,7 @@ show_targetdebug (struct ui_file *file, int from_tty,
 }
 
 int
-target_has_memory_1 (void)
+target_has_memory ()
 {
   for (target_ops *t = current_top_target (); t != NULL; t = t->beneath ())
     if (t->has_memory ())

diff --git a/gdb/target.h b/gdb/target.h
index 23022a118adfb638ab4c933228eecbe8c45aa39e..2024b1340be7e7d89945025148dec51587dc32ea 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1812,8 +1812,7 @@ extern void default_target_pass_ctrlc (struct target_ops *ops);
 
 /* Does the target include memory?  (Dummy targets don't.)  */
 
-extern int target_has_memory_1 (void);
-#define target_has_memory target_has_memory_1 ()
+extern int target_has_memory ();
 
 /* Does the target have a stack?  (Exec files don't, VxWorks doesn't, until
    we start a process.)  */

diff --git a/gdb/thread.c b/gdb/thread.c
index 0217f3b54f7a1054d1422f58755ad305c812ca55..ba119b009b2caf83f372fe57cbf5b0ed4bf36f68 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1407,7 +1407,7 @@ scoped_restore_current_thread::restore ()
       && m_thread->state == THREAD_STOPPED
       && target_has_registers
       && target_has_stack
-      && target_has_memory)
+      && target_has_memory ())
     restore_selected_frame (m_selected_frame_id, m_selected_frame_level);
 }
 
@@ -1441,7 +1441,7 @@ scoped_restore_current_thread::scoped_restore_current_thread ()
       if (m_was_stopped
          && target_has_registers
          && target_has_stack
-         && target_has_memory)
+         && target_has_memory ())
        {
          /* When processing internal events, there might not be a
             selected frame.  If we naively call get_selected_frame

diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 04d7469de5ab2f18a8d0d39316d057db106c2203..d7d13045d092ce7f61a0a0cf6a5e2510c31bbdd5 100644 (file)
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -182,7 +182,7 @@ tui_data_window::show_registers (struct reggroup *group)
   if (group == 0)
     group = general_reggroup;
 
-  if (target_has_registers && target_has_stack && target_has_memory)
+  if (target_has_registers && target_has_stack && target_has_memory ())
     {
       show_register_group (group, get_selected_frame (NULL),
                           group == m_current_group);