From 423a48075e748691f7fa83dbae404da3e4edc914 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:35:15 -0700 Subject: [PATCH] convert to_kill 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_kill): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. --- gdb/ChangeLog | 7 +++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 15 +++------------ gdb/target.h | 3 ++- 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4217562329..2dceb4c4a7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_kill): Unconditionally delegate. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_NORETURN. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 9d7065caf4..3c6b3120fe 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -361,6 +361,19 @@ delegate_terminal_info (struct target_ops *self, const char *arg1, int arg2) self->to_terminal_info (self, arg1, arg2); } +static void +delegate_kill (struct target_ops *self) +{ + self = self->beneath; + self->to_kill (self); +} + +static void +tdefault_kill (struct target_ops *self) +{ + noprocess (); +} + static void delegate_load (struct target_ops *self, char *arg1, int arg2) { @@ -1203,6 +1216,8 @@ install_delegators (struct target_ops *ops) ops->to_terminal_save_ours = delegate_terminal_save_ours; if (ops->to_terminal_info == NULL) ops->to_terminal_info = delegate_terminal_info; + if (ops->to_kill == NULL) + ops->to_kill = delegate_kill; if (ops->to_load == NULL) ops->to_load = delegate_load; if (ops->to_post_startup_inferior == NULL) @@ -1367,6 +1382,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_terminal_ours = tdefault_terminal_ours; ops->to_terminal_save_ours = tdefault_terminal_save_ours; ops->to_terminal_info = default_terminal_info; + ops->to_kill = tdefault_kill; ops->to_load = tdefault_load; ops->to_post_startup_inferior = tdefault_post_startup_inferior; ops->to_insert_fork_catchpoint = tdefault_insert_fork_catchpoint; diff --git a/gdb/target.c b/gdb/target.c index 8306906b84..3d27eda41b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -452,19 +452,10 @@ target_ignore (void) void target_kill (void) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_kill != NULL) - { - if (targetdebug) - fprintf_unfiltered (gdb_stdlog, "target_kill ()\n"); - - t->to_kill (t); - return; - } + if (targetdebug) + fprintf_unfiltered (gdb_stdlog, "target_kill ()\n"); - noprocess (); + current_target.to_kill (¤t_target); } void diff --git a/gdb/target.h b/gdb/target.h index 696020cfce..5b6ada7a4e 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -517,7 +517,8 @@ struct target_ops TARGET_DEFAULT_IGNORE (); void (*to_terminal_info) (struct target_ops *, const char *, int) TARGET_DEFAULT_FUNC (default_terminal_info); - void (*to_kill) (struct target_ops *); + void (*to_kill) (struct target_ops *) + TARGET_DEFAULT_NORETURN (noprocess ()); void (*to_load) (struct target_ops *, char *, int) TARGET_DEFAULT_NORETURN (tcomplain ()); void (*to_create_inferior) (struct target_ops *, -- 2.34.1