From 05969c841a349cbc9d628650b37d684526368445 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 20:22:36 -0700 Subject: [PATCH] convert to_goto_record 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_goto_record): 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 a241251bc65..9feb4480196 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_goto_record): 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 1963ccfffdc..9ecb97485b4 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_goto_record (struct target_ops *self, ULONGEST arg1) +{ + self = self->beneath; + self->to_goto_record (self, arg1); +} + +static void +tdefault_goto_record (struct target_ops *self, ULONGEST arg1) +{ + tcomplain (); +} + static void delegate_insn_history (struct target_ops *self, int arg1, int arg2) { @@ -1566,6 +1579,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_goto_record == NULL) + ops->to_goto_record = delegate_goto_record; if (ops->to_insn_history == NULL) ops->to_insn_history = delegate_insn_history; if (ops->to_insn_history_from == NULL) @@ -1691,6 +1706,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_goto_record = tdefault_goto_record; ops->to_insn_history = tdefault_insn_history; ops->to_insn_history_from = tdefault_insn_history_from; ops->to_insn_history_range = tdefault_insn_history_range; diff --git a/gdb/target.c b/gdb/target.c index ae57793760a..1b87c74894e 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3995,16 +3995,7 @@ target_goto_record_end (void) void target_goto_record (ULONGEST insn) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_goto_record != NULL) - { - t->to_goto_record (t, insn); - return; - } - - tcomplain (); + current_target.to_goto_record (¤t_target, insn); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index 71062c90d4d..0cf2e4d3ef9 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1041,7 +1041,8 @@ struct target_ops void (*to_goto_record_end) (struct target_ops *); /* Go to a specific location in the recorded execution trace. */ - void (*to_goto_record) (struct target_ops *, ULONGEST insn); + void (*to_goto_record) (struct target_ops *, ULONGEST insn) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Disassemble SIZE instructions in the recorded execution trace from the current position. -- 2.30.2