diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-12-18 14:35:15 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:48:11 -0700 |
| commit | 423a48075e748691f7fa83dbae404da3e4edc914 (patch) | |
| tree | 7b2c54dd9658c59dc407f565d2a5c390c75b5cca /gdb | |
| parent | 6c7e5e5cdc78f2930423b87d76006e067749e6ba (diff) | |
| download | gdb-423a48075e748691f7fa83dbae404da3e4edc914.zip gdb-423a48075e748691f7fa83dbae404da3e4edc914.tar.gz gdb-423a48075e748691f7fa83dbae404da3e4edc914.tar.bz2 | |
convert to_kill
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (target_kill): Unconditionally delegate.
* target.h (struct target_ops) <to_kill>: Use
TARGET_DEFAULT_NORETURN.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 16 | ||||
| -rw-r--r-- | gdb/target.c | 15 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 28 insertions, 13 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4217562..2dceb4c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,13 @@ 2014-02-19 Tom Tromey <tromey@redhat.com> * target-delegates.c: Rebuild. + * target.c (target_kill): Unconditionally delegate. + * target.h (struct target_ops) <to_kill>: Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. * target.c (target_masked_watch_num_registers): Unconditionally delegate. * target.h (struct target_ops) <to_masked_watch_num_registers>: diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 9d7065c..3c6b312 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -362,6 +362,19 @@ delegate_terminal_info (struct target_ops *self, const char *arg1, int 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) { self = self->beneath; @@ -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 8306906..3d27eda 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 696020c..5b6ada7 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 *, |