diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 16 | ||||
| -rw-r--r-- | gdb/target.c | 7 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 29 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 18792c6..9db4fd4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,15 @@ 2014-02-19 Tom Tromey <tromey@redhat.com> * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_can_run. + (find_default_run_target): Check against delegate_can_run. + * target.h (struct target_ops) <to_can_run>: Use + TARGET_DEFAULT_RETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. * target.c (target_disconnect): Unconditionally delegate. * target.h (struct target_ops) <to_disconnect>: Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 1565c78..0ffee5a 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -530,6 +530,19 @@ delegate_mourn_inferior (struct target_ops *self) self->to_mourn_inferior (self); } +static int +delegate_can_run (struct target_ops *self) +{ + self = self->beneath; + return self->to_can_run (self); +} + +static int +tdefault_can_run (struct target_ops *self) +{ + return 0; +} + static void delegate_pass_signals (struct target_ops *self, int arg1, unsigned char *arg2) { @@ -1639,6 +1652,8 @@ install_delegators (struct target_ops *ops) 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) + ops->to_can_run = delegate_can_run; if (ops->to_pass_signals == NULL) ops->to_pass_signals = delegate_pass_signals; if (ops->to_program_signals == NULL) @@ -1857,6 +1872,7 @@ install_dummy_methods (struct target_ops *ops) 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; ops->to_program_signals = tdefault_program_signals; ops->to_thread_alive = tdefault_thread_alive; diff --git a/gdb/target.c b/gdb/target.c index bf93220..13b2e65 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -653,7 +653,7 @@ update_current_target (void) /* Do not inherit to_set_syscall_catchpoint. */ /* Do not inherit to_has_exited. */ /* Do not inherit to_mourn_inferior. */ - INHERIT (to_can_run, t); + /* Do not inherit to_can_run. */ /* Do not inherit to_pass_signals. */ /* Do not inherit to_program_signals. */ /* Do not inherit to_thread_alive. */ @@ -748,9 +748,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - de_fault (to_can_run, - (int (*) (struct target_ops *)) - return_zero); current_target.to_read_description = NULL; #undef de_fault @@ -2852,7 +2849,7 @@ find_default_run_target (char *do_mesg) for (t = target_structs; t < target_structs + target_struct_size; ++t) { - if ((*t)->to_can_run && target_can_run (*t)) + if ((*t)->to_can_run != delegate_can_run && target_can_run (*t)) { runable = *t; ++count; diff --git a/gdb/target.h b/gdb/target.h index 1ceb74d..ec15e5b 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -547,7 +547,8 @@ struct target_ops TARGET_DEFAULT_RETURN (0); void (*to_mourn_inferior) (struct target_ops *) TARGET_DEFAULT_FUNC (default_mourn_inferior); - int (*to_can_run) (struct target_ops *); + int (*to_can_run) (struct target_ops *) + TARGET_DEFAULT_RETURN (0); /* Documentation of this routine is provided with the corresponding target_* macro. */ |