From 671e76cc63ebed981621ee747e18a73320ea426d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 20:24:04 -0700 Subject: [PATCH] convert to_goto_record_begin 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_goto_record_begin): 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 8913d77..39b6491 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,13 @@ 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. + * target.c (target_goto_record_begin): Unconditionally delegate. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. * target.c (target_goto_record_end): Unconditionally delegate. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 7dece70..f7454fd 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -1261,6 +1261,19 @@ tdefault_supports_btrace (struct target_ops *self) } static void +delegate_goto_record_begin (struct target_ops *self) +{ + self = self->beneath; + self->to_goto_record_begin (self); +} + +static void +tdefault_goto_record_begin (struct target_ops *self) +{ + tcomplain (); +} + +static void delegate_goto_record_end (struct target_ops *self) { self = self->beneath; @@ -1592,6 +1605,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_begin == NULL) + ops->to_goto_record_begin = delegate_goto_record_begin; if (ops->to_goto_record_end == NULL) ops->to_goto_record_end = delegate_goto_record_end; if (ops->to_goto_record == NULL) @@ -1721,6 +1736,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_begin = tdefault_goto_record_begin; ops->to_goto_record_end = tdefault_goto_record_end; ops->to_goto_record = tdefault_goto_record; ops->to_insn_history = tdefault_insn_history; diff --git a/gdb/target.c b/gdb/target.c index 7e422f8..1c7b534 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3961,16 +3961,7 @@ target_record_is_replaying (void) void target_goto_record_begin (void) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_goto_record_begin != NULL) - { - t->to_goto_record_begin (t); - return; - } - - tcomplain (); + current_target.to_goto_record_begin (¤t_target); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index cb1c431..d90205c 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1035,7 +1035,8 @@ struct target_ops int (*to_record_is_replaying) (struct target_ops *); /* Go to the begin of the execution trace. */ - void (*to_goto_record_begin) (struct target_ops *); + void (*to_goto_record_begin) (struct target_ops *) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Go to the end of the execution trace. */ void (*to_goto_record_end) (struct target_ops *) -- 2.7.4