From 115d9817bba7bf2eb44fe6a1e5f92100cad5553d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 20:10:20 -0700 Subject: [PATCH] convert to_call_history_range 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_call_history_range): 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 adcdf65370..f4b8ee38f5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_call_history_range): 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 20ebda8284..defddcbab6 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1260,6 +1260,19 @@ tdefault_supports_btrace (struct target_ops *self) return 0; } +static void +delegate_call_history_range (struct target_ops *self, ULONGEST arg1, ULONGEST arg2, int arg3) +{ + self = self->beneath; + self->to_call_history_range (self, arg1, arg2, arg3); +} + +static void +tdefault_call_history_range (struct target_ops *self, ULONGEST arg1, ULONGEST arg2, int arg3) +{ + tcomplain (); +} + static int delegate_augmented_libraries_svr4_read (struct target_ops *self) { @@ -1488,6 +1501,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_call_history_range == NULL) + ops->to_call_history_range = delegate_call_history_range; if (ops->to_augmented_libraries_svr4_read == NULL) ops->to_augmented_libraries_svr4_read = delegate_augmented_libraries_svr4_read; } @@ -1601,5 +1616,6 @@ 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_call_history_range = tdefault_call_history_range; ops->to_augmented_libraries_svr4_read = tdefault_augmented_libraries_svr4_read; } diff --git a/gdb/target.c b/gdb/target.c index 44686480a5..c3a73a83f0 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -4097,16 +4097,7 @@ target_call_history_from (ULONGEST begin, int size, int flags) void target_call_history_range (ULONGEST begin, ULONGEST end, int flags) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_call_history_range != NULL) - { - t->to_call_history_range (t, begin, end, flags); - return; - } - - tcomplain (); + current_target.to_call_history_range (¤t_target, begin, end, flags); } static void diff --git a/gdb/target.h b/gdb/target.h index 69f3c1f601..5c931b9a75 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1076,7 +1076,8 @@ struct target_ops /* Print a function trace of an execution trace section from function BEGIN (inclusive) to function END (inclusive). */ void (*to_call_history_range) (struct target_ops *, - ULONGEST begin, ULONGEST end, int flags); + ULONGEST begin, ULONGEST end, int flags) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Nonzero if TARGET_OBJECT_LIBRARIES_SVR4 may be read with a non-empty annex. */ -- 2.34.1