From c29302cc8aef5856ae6ed63cef46c17dcc1b790a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 20:15:44 -0700 Subject: [PATCH] convert to_insn_history_range 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_insn_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 0a214127af..f2aa5c25d6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_insn_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 5755146da9..a1d748c3e5 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_insn_history_range (struct target_ops *self, ULONGEST arg1, ULONGEST arg2, int arg3) +{ + self = self->beneath; + self->to_insn_history_range (self, arg1, arg2, arg3); +} + +static void +tdefault_insn_history_range (struct target_ops *self, ULONGEST arg1, ULONGEST arg2, int arg3) +{ + tcomplain (); +} + static void delegate_call_history (struct target_ops *self, int arg1, int arg2) { @@ -1527,6 +1540,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_insn_history_range == NULL) + ops->to_insn_history_range = delegate_insn_history_range; if (ops->to_call_history == NULL) ops->to_call_history = delegate_call_history; if (ops->to_call_history_from == NULL) @@ -1646,6 +1661,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_insn_history_range = tdefault_insn_history_range; ops->to_call_history = tdefault_call_history; ops->to_call_history_from = tdefault_call_history_from; ops->to_call_history_range = tdefault_call_history_range; diff --git a/gdb/target.c b/gdb/target.c index d2db18db8c..b20c1503b4 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -4046,16 +4046,7 @@ target_insn_history_from (ULONGEST from, int size, int flags) void target_insn_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_insn_history_range != NULL) - { - t->to_insn_history_range (t, begin, end, flags); - return; - } - - tcomplain (); + current_target.to_insn_history_range (¤t_target, begin, end, flags); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index 9f7a3dc855..f53b73e82a 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1059,7 +1059,8 @@ struct target_ops /* Disassemble a section of the recorded execution trace from instruction BEGIN (inclusive) to instruction END (inclusive). */ void (*to_insn_history_range) (struct target_ops *, - ULONGEST begin, ULONGEST end, int flags); + ULONGEST begin, ULONGEST end, int flags) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Print a function trace of the recorded execution trace. If SIZE < 0, print abs (SIZE) preceding functions; otherwise, print SIZE