From 07366925095c7d091360b92bd686b4dc58ecd4f3 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 20:25:47 -0700 Subject: [PATCH] convert to_delete_record 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (target_delete_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 6ced320f4a..3e54272be4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (target_delete_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 b0f757697a..4e5fd1ae41 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_delete_record (struct target_ops *self) +{ + self = self->beneath; + self->to_delete_record (self); +} + +static void +tdefault_delete_record (struct target_ops *self) +{ + tcomplain (); +} + static int delegate_record_is_replaying (struct target_ops *self) { @@ -1618,6 +1631,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_delete_record == NULL) + ops->to_delete_record = delegate_delete_record; if (ops->to_record_is_replaying == NULL) ops->to_record_is_replaying = delegate_record_is_replaying; if (ops->to_goto_record_begin == NULL) @@ -1751,6 +1766,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_delete_record = tdefault_delete_record; ops->to_record_is_replaying = tdefault_record_is_replaying; ops->to_goto_record_begin = tdefault_goto_record_begin; ops->to_goto_record_end = tdefault_goto_record_end; diff --git a/gdb/target.c b/gdb/target.c index c60c85c63d..5b8c591b1c 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -3930,16 +3930,7 @@ target_supports_delete_record (void) void target_delete_record (void) { - struct target_ops *t; - - for (t = current_target.beneath; t != NULL; t = t->beneath) - if (t->to_delete_record != NULL) - { - t->to_delete_record (t); - return; - } - - tcomplain (); + current_target.to_delete_record (¤t_target); } /* See target.h. */ diff --git a/gdb/target.h b/gdb/target.h index dcac55d399..0bce110866 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1029,7 +1029,8 @@ struct target_ops void (*to_save_record) (struct target_ops *, const char *filename); /* Delete the recorded execution trace from the current position onwards. */ - void (*to_delete_record) (struct target_ops *); + void (*to_delete_record) (struct target_ops *) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Query if the record target is currently replaying. */ int (*to_record_is_replaying) (struct target_ops *) -- 2.34.1