convert to_stop

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_stop.
	* target.h (struct target_ops) <to_stop>: Use
	TARGET_DEFAULT_IGNORE.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4d867fad280ca5e5355b779385c5152f5f66b385..95d308fdc32daca7ab5714691db7aaff2e149d63 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (update_current_target): Don't inherit or default
+       to_stop.
+       * target.h (struct target_ops) <to_stop>: Use
+       TARGET_DEFAULT_IGNORE.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target-delegates.c: Rebuild.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 69a498ddb3fb322ba2b7a16730fd1f8b24ea180d..122005883a37697499111173ad693cdab68e6dda 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -452,6 +452,18 @@ tdefault_thread_name (struct target_ops *self, struct thread_info *arg1)
   return 0;
 }
 
+static void
+delegate_stop (struct target_ops *self, ptid_t arg1)
+{
+  self = self->beneath;
+  self->to_stop (self, arg1);
+}
+
+static void
+tdefault_stop (struct target_ops *self, ptid_t arg1)
+{
+}
+
 static void
 delegate_rcmd (struct target_ops *self, char *arg1, struct ui_file *arg2)
 {
@@ -1141,6 +1153,8 @@ install_delegators (struct target_ops *ops)
     ops->to_extra_thread_info = delegate_extra_thread_info;
   if (ops->to_thread_name == NULL)
     ops->to_thread_name = delegate_thread_name;
+  if (ops->to_stop == NULL)
+    ops->to_stop = delegate_stop;
   if (ops->to_rcmd == NULL)
     ops->to_rcmd = delegate_rcmd;
   if (ops->to_pid_to_exec_file == NULL)
@@ -1286,6 +1300,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_has_exited = tdefault_has_exited;
   ops->to_extra_thread_info = tdefault_extra_thread_info;
   ops->to_thread_name = tdefault_thread_name;
+  ops->to_stop = tdefault_stop;
   ops->to_rcmd = default_rcmd;
   ops->to_pid_to_exec_file = tdefault_pid_to_exec_file;
   ops->to_log_command = tdefault_log_command;

diff --git a/gdb/target.c b/gdb/target.c
index 6533e7e6e02203f641dffc741c08c10176cc1cd7..0432dfd06d0c31fd135ec72e479106dd7a5df0be 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -655,7 +655,7 @@ update_current_target (void)
       /* Do not inherit to_pid_to_str.  */
       /* Do not inherit to_extra_thread_info.  */
       /* Do not inherit to_thread_name.  */
-      INHERIT (to_stop, t);
+      /* Do not inherit to_stop.  */
       /* Do not inherit to_xfer_partial.  */
       /* Do not inherit to_rcmd.  */
       /* Do not inherit to_pid_to_exec_file.  */
@@ -745,9 +745,6 @@ update_current_target (void)
   de_fault (to_can_run,
            (int (*) (struct target_ops *))
            return_zero);
-  de_fault (to_stop,
-           (void (*) (struct target_ops *, ptid_t))
-           target_ignore);
   current_target.to_read_description = NULL;
 
 #undef de_fault

diff --git a/gdb/target.h b/gdb/target.h
index 44d270ceca2b86331bc886ce0c5be5477865ffeb..64f6b6e94e9551b0cf1c6519c64b69110fb40ffd 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -555,7 +555,8 @@ struct target_ops
       TARGET_DEFAULT_RETURN (0);
     char *(*to_thread_name) (struct target_ops *, struct thread_info *)
       TARGET_DEFAULT_RETURN (0);
-    void (*to_stop) (struct target_ops *, ptid_t);
+    void (*to_stop) (struct target_ops *, ptid_t)
+      TARGET_DEFAULT_IGNORE ();
     void (*to_rcmd) (struct target_ops *,
                     char *command, struct ui_file *output)
       TARGET_DEFAULT_FUNC (default_rcmd);