Add target_ops argument to to_has_exited

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target.h (struct target_ops) <to_has_exited>: Add argument.
	(target_has_exited): Add argument.
	* target.c (debug_to_has_exited): Add argument.
	(update_current_target): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 87f0beac1a99ed0b295dc1ef6e80c49f516c5fbd..30db237d0842d370de43657bdd5d803cd6ad6e6b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_has_exited>: Add argument.
+       (target_has_exited): Add argument.
+       * target.c (debug_to_has_exited): Add argument.
+       (update_current_target): Update.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_set_syscall_catchpoint>: Add

diff --git a/gdb/target.c b/gdb/target.c
index 74a2817034eb19ce190213343303c2cf6f06568b..ff614618181c241bd738d611f1d5de541bd16ca3 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -813,7 +813,7 @@ update_current_target (void)
            (int (*) (struct target_ops *, int, int, int, int, int *))
            return_one);
   de_fault (to_has_exited,
-           (int (*) (int, int, int *))
+           (int (*) (struct target_ops *, int, int, int *))
            return_zero);
   de_fault (to_can_run,
            return_zero);
@@ -4944,11 +4944,13 @@ debug_to_remove_exec_catchpoint (struct target_ops *self, int pid)
 }
 
 static int
-debug_to_has_exited (int pid, int wait_status, int *exit_status)
+debug_to_has_exited (struct target_ops *self,
+                    int pid, int wait_status, int *exit_status)
 {
   int has_exited;
 
-  has_exited = debug_target.to_has_exited (pid, wait_status, exit_status);
+  has_exited = debug_target.to_has_exited (&debug_target,
+                                          pid, wait_status, exit_status);
 
   fprintf_unfiltered (gdb_stdlog, "target_has_exited (%d, %d, %d) = %d\n",
                      pid, wait_status, *exit_status, has_exited);

diff --git a/gdb/target.h b/gdb/target.h
index f40dcdd1d05985a1848dfb67b3dd091e74a7b84d..8d73472fa113f25c87a35c86fdd178e23bbcc665 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -507,7 +507,7 @@ struct target_ops
     int (*to_remove_exec_catchpoint) (struct target_ops *, int);
     int (*to_set_syscall_catchpoint) (struct target_ops *,
                                      int, int, int, int, int *);
-    int (*to_has_exited) (int, int, int *);
+    int (*to_has_exited) (struct target_ops *, int, int, int *);
     void (*to_mourn_inferior) (struct target_ops *);
     int (*to_can_run) (void);
 
@@ -1368,7 +1368,8 @@ int target_follow_fork (int follow_child, int detach_fork);
    exit code of PID, if any.  */
 
 #define target_has_exited(pid,wait_status,exit_status) \
-     (*current_target.to_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