From 9ace480d62cd71d27f3a6701a413de0c7e46655a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 19 Dec 2013 08:18:04 -0700 Subject: [PATCH] convert to_teardown_btrace 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_teardown_btrace): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. --- gdb/ChangeLog | 7 +++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 11 +---------- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6b61768062b..0402da30bae 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_teardown_btrace): 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 30c2849be15..800a37c79fa 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1313,6 +1313,19 @@ tdefault_disable_btrace (struct target_ops *self, struct btrace_target_info *arg tcomplain (); } +static void +delegate_teardown_btrace (struct target_ops *self, struct btrace_target_info *arg1) +{ + self = self->beneath; + self->to_teardown_btrace (self, arg1); +} + +static void +tdefault_teardown_btrace (struct target_ops *self, struct btrace_target_info *arg1) +{ + tcomplain (); +} + static void delegate_save_record (struct target_ops *self, const char *arg1) { @@ -1707,6 +1720,8 @@ install_delegators (struct target_ops *ops) ops->to_supports_btrace = delegate_supports_btrace; if (ops->to_disable_btrace == NULL) ops->to_disable_btrace = delegate_disable_btrace; + if (ops->to_teardown_btrace == NULL) + ops->to_teardown_btrace = delegate_teardown_btrace; if (ops->to_save_record == NULL) ops->to_save_record = delegate_save_record; if (ops->to_delete_record == NULL) @@ -1849,6 +1864,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_can_use_agent = tdefault_can_use_agent; ops->to_supports_btrace = tdefault_supports_btrace; ops->to_disable_btrace = tdefault_disable_btrace; + ops->to_teardown_btrace = tdefault_teardown_btrace; ops->to_save_record = tdefault_save_record; ops->to_delete_record = tdefault_delete_record; ops->to_record_is_replaying = tdefault_record_is_replaying; diff --git a/gdb/target.c b/gdb/target.c index 2914a2aa681..85ee3312c9c 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3807,16 +3807,7 @@ target_disable_btrace (struct btrace_target_info *btinfo) void target_teardown_btrace (struct btrace_target_info *btinfo) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_teardown_btrace != NULL) - { - t->to_teardown_btrace (t, btinfo); - return; - } - - tcomplain (); + current_target.to_teardown_btrace (¤t_target, btinfo); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index eed1d6638e5..8898438519b 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1013,7 +1013,8 @@ struct target_ops only allowed to perform actions that are safe. A counter-example would be attempting to talk to a remote target. */ void (*to_teardown_btrace) (struct target_ops *, - struct btrace_target_info *tinfo); + struct btrace_target_info *tinfo) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Read branch trace data for the thread indicated by BTINFO into DATA. DATA is cleared before new trace is added. -- 2.30.2