diff options
author | Tom Tromey <tromey@redhat.com> | 2013-12-19 08:17:16 -0700 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:48:35 -0700 |
commit | 8dc292d3217b0cb85ada1b531f9e7e3249b5075e (patch) | |
tree | 956a0c3eeb8be629ce0c4f4a195080871639b9de /gdb | |
parent | 58a5184e2aa7a9fcc2a796b44bae124d173cec1a (diff) | |
download | gdb-8dc292d3217b0cb85ada1b531f9e7e3249b5075e.zip gdb-8dc292d3217b0cb85ada1b531f9e7e3249b5075e.tar.gz gdb-8dc292d3217b0cb85ada1b531f9e7e3249b5075e.tar.bz2 |
convert to_disable_btrace
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (target_disable_btrace): Unconditionally delegate.
* target.h (struct target_ops) <to_disable_btrace>: 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 | 11 | ||||
-rw-r--r-- | gdb/target.h | 3 |
4 files changed, 26 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c6cb8b1..6b61768 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_disable_btrace): Unconditionally delegate. + * target.h (struct target_ops) <to_disable_btrace>: Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. * target.c (default_search_memory): New function. (simple_search_memory): Update comment. (target_search_memory): Unconditionally delegate. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index e0c7833..30c2849 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1301,6 +1301,19 @@ tdefault_supports_btrace (struct target_ops *self) } static void +delegate_disable_btrace (struct target_ops *self, struct btrace_target_info *arg1) +{ + self = self->beneath; + self->to_disable_btrace (self, arg1); +} + +static void +tdefault_disable_btrace (struct target_ops *self, struct btrace_target_info *arg1) +{ + tcomplain (); +} + +static void delegate_save_record (struct target_ops *self, const char *arg1) { self = self->beneath; @@ -1692,6 +1705,8 @@ install_delegators (struct target_ops *ops) ops->to_can_use_agent = delegate_can_use_agent; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; + if (ops->to_disable_btrace == NULL) + ops->to_disable_btrace = delegate_disable_btrace; if (ops->to_save_record == NULL) ops->to_save_record = delegate_save_record; if (ops->to_delete_record == NULL) @@ -1833,6 +1848,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_use_agent = tdefault_use_agent; 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_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 92be667..2914a2a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3799,16 +3799,7 @@ target_enable_btrace (ptid_t ptid) void target_disable_btrace (struct btrace_target_info *btinfo) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_disable_btrace != NULL) - { - t->to_disable_btrace (t, btinfo); - return; - } - - tcomplain (); + current_target.to_disable_btrace (¤t_target, btinfo); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index 4474f43..eed1d66 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1005,7 +1005,8 @@ struct target_ops /* Disable branch tracing and deallocate TINFO. */ void (*to_disable_btrace) (struct target_ops *, - struct btrace_target_info *tinfo); + struct btrace_target_info *tinfo) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Disable branch tracing and deallocate TINFO. This function is similar to to_disable_btrace, except that it is called during teardown and is |