Patchwork [pushed/ob] Eliminate target_has_exited

login
register
mail settings
Submitter Pedro Alves
Date April 12, 2018, 4:42 p.m.
Message ID <20180412164255.23500-1-palves@redhat.com>
Download mbox | patch
Permalink /patch/26692/
State New
Headers show

Comments

Pedro Alves - April 12, 2018, 4:42 p.m.
Nothing uses this.

gdb/ChangeLog:
2018-04-12  Pedro Alves  <palves@redhat.com>

	* target.h (target_ops::to_has_exited): Delete.
	(target_has_exited): Delete.
	* target-delegates.c: Regenerate.
---
 gdb/ChangeLog          |  6 ++++++
 gdb/target-delegates.c | 37 -------------------------------------
 gdb/target.h           |  9 ---------
 3 files changed, 6 insertions(+), 46 deletions(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 04754ac2ef..a05520fb7c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@ 
+2018-04-12  Pedro Alves  <palves@redhat.com>
+
+	* target.h (target_ops::to_has_exited): Delete.
+	(target_has_exited): Delete.
+	* target-delegates.c: Regenerate.
+
 2018-04-11  Pedro Alves  <palves@redhat.com>
 
 	* target.c (fileio_fh_t::t): Add comment.
diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 9521240efd..6ff3e06cc8 100644
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -1342,39 +1342,6 @@  debug_set_syscall_catchpoint (struct target_ops *self, int arg1, bool arg2, int
   return result;
 }
 
-static int
-delegate_has_exited (struct target_ops *self, int arg1, int arg2, int *arg3)
-{
-  self = self->beneath;
-  return self->to_has_exited (self, arg1, arg2, arg3);
-}
-
-static int
-tdefault_has_exited (struct target_ops *self, int arg1, int arg2, int *arg3)
-{
-  return 0;
-}
-
-static int
-debug_has_exited (struct target_ops *self, int arg1, int arg2, int *arg3)
-{
-  int result;
-  fprintf_unfiltered (gdb_stdlog, "-> %s->to_has_exited (...)\n", debug_target.to_shortname);
-  result = debug_target.to_has_exited (&debug_target, arg1, arg2, arg3);
-  fprintf_unfiltered (gdb_stdlog, "<- %s->to_has_exited (", debug_target.to_shortname);
-  target_debug_print_struct_target_ops_p (&debug_target);
-  fputs_unfiltered (", ", gdb_stdlog);
-  target_debug_print_int (arg1);
-  fputs_unfiltered (", ", gdb_stdlog);
-  target_debug_print_int (arg2);
-  fputs_unfiltered (", ", gdb_stdlog);
-  target_debug_print_int_p (arg3);
-  fputs_unfiltered (") = ", gdb_stdlog);
-  target_debug_print_int (result);
-  fputs_unfiltered ("\n", gdb_stdlog);
-  return result;
-}
-
 static void
 delegate_mourn_inferior (struct target_ops *self)
 {
@@ -4271,8 +4238,6 @@  install_delegators (struct target_ops *ops)
     ops->to_follow_exec = delegate_follow_exec;
   if (ops->to_set_syscall_catchpoint == NULL)
     ops->to_set_syscall_catchpoint = delegate_set_syscall_catchpoint;
-  if (ops->to_has_exited == NULL)
-    ops->to_has_exited = delegate_has_exited;
   if (ops->to_mourn_inferior == NULL)
     ops->to_mourn_inferior = delegate_mourn_inferior;
   if (ops->to_can_run == NULL)
@@ -4537,7 +4502,6 @@  install_dummy_methods (struct target_ops *ops)
   ops->to_remove_exec_catchpoint = tdefault_remove_exec_catchpoint;
   ops->to_follow_exec = tdefault_follow_exec;
   ops->to_set_syscall_catchpoint = tdefault_set_syscall_catchpoint;
-  ops->to_has_exited = tdefault_has_exited;
   ops->to_mourn_inferior = default_mourn_inferior;
   ops->to_can_run = tdefault_can_run;
   ops->to_pass_signals = tdefault_pass_signals;
@@ -4697,7 +4661,6 @@  init_debug_target (struct target_ops *ops)
   ops->to_remove_exec_catchpoint = debug_remove_exec_catchpoint;
   ops->to_follow_exec = debug_follow_exec;
   ops->to_set_syscall_catchpoint = debug_set_syscall_catchpoint;
-  ops->to_has_exited = debug_has_exited;
   ops->to_mourn_inferior = debug_mourn_inferior;
   ops->to_can_run = debug_can_run;
   ops->to_pass_signals = debug_pass_signals;
diff --git a/gdb/target.h b/gdb/target.h
index d7580ace63..f208b10767 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -597,8 +597,6 @@  struct target_ops
 				      int, bool, int,
 				      gdb::array_view<const int>)
       TARGET_DEFAULT_RETURN (1);
-    int (*to_has_exited) (struct target_ops *, int, int, int *)
-      TARGET_DEFAULT_RETURN (0);
     void (*to_mourn_inferior) (struct target_ops *)
       TARGET_DEFAULT_FUNC (default_mourn_inferior);
     /* Note that to_can_run is special and can be invoked on an
@@ -1624,13 +1622,6 @@  void target_follow_exec (struct inferior *inf, char *execd_pathname);
 						  pid, needed, any_count, \
 						  syscall_counts)
 
-/* Returns TRUE if PID has exited.  And, also sets EXIT_STATUS to the
-   exit code of PID, if any.  */
-
-#define target_has_exited(pid,wait_status,exit_status) \
-     (*current_target.to_has_exited) (&current_target, \
-				      pid,wait_status,exit_status)
-
 /* The debugger has completed a blocking wait() call.  There is now
    some process event that must be processed.  This function should
    be defined by those targets that require the debugger to perform