From 46ee7e8d84bb33c3c6c5dc8673ee2ca5457462b0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:28:07 -0700 Subject: [PATCH] convert to_stop 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_stop. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 15 +++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4d867fad280..95d308fdc32 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_stop. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_IGNORE. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 69a498ddb3f..122005883a3 100644 --- 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 6533e7e6e02..0432dfd06d0 100644 --- 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 44d270ceca2..64f6b6e94e9 100644 --- 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); -- 2.30.2