From a2e6c147fcef5671c6c99f647a8e4587a117db30 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:09:37 -0700 Subject: [PATCH] convert to_save_trace_data 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_save_trace_data. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44b1a9611a3..987d8b2d9e3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_save_trace_data. + * 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 4c934e7a0ff..a1844d8ccfe 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -806,6 +806,19 @@ tdefault_get_trace_state_variable_value (struct target_ops *self, int arg1, LONG return 0; } +static int +delegate_save_trace_data (struct target_ops *self, const char *arg1) +{ + self = self->beneath; + return self->to_save_trace_data (self, arg1); +} + +static int +tdefault_save_trace_data (struct target_ops *self, const char *arg1) +{ + tcomplain (); +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -960,6 +973,8 @@ install_delegators (struct target_ops *ops) ops->to_trace_find = delegate_trace_find; if (ops->to_get_trace_state_variable_value == NULL) ops->to_get_trace_state_variable_value = delegate_get_trace_state_variable_value; + if (ops->to_save_trace_data == NULL) + ops->to_save_trace_data = delegate_save_trace_data; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1036,5 +1051,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_trace_stop = tdefault_trace_stop; ops->to_trace_find = tdefault_trace_find; ops->to_get_trace_state_variable_value = tdefault_get_trace_state_variable_value; + ops->to_save_trace_data = tdefault_save_trace_data; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index f0309f13263..44900ed995d 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -701,7 +701,7 @@ update_current_target (void) /* Do not inherit to_trace_stop. */ /* Do not inherit to_trace_find. */ /* Do not inherit to_get_trace_state_variable_value. */ - INHERIT (to_save_trace_data, t); + /* Do not inherit to_save_trace_data. */ INHERIT (to_upload_tracepoints, t); INHERIT (to_upload_trace_state_variables, t); INHERIT (to_get_raw_trace_data, t); @@ -752,9 +752,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); current_target.to_read_description = NULL; - de_fault (to_save_trace_data, - (int (*) (struct target_ops *, const char *)) - tcomplain); de_fault (to_upload_tracepoints, (int (*) (struct target_ops *, struct uploaded_tp **)) return_zero); diff --git a/gdb/target.h b/gdb/target.h index 4331b9117f6..9a7f3e4ae68 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -869,7 +869,8 @@ struct target_ops int tsv, LONGEST *val) TARGET_DEFAULT_RETURN (0); - int (*to_save_trace_data) (struct target_ops *, const char *filename); + int (*to_save_trace_data) (struct target_ops *, const char *filename) + TARGET_DEFAULT_NORETURN (tcomplain ()); int (*to_upload_tracepoints) (struct target_ops *, struct uploaded_tp **utpp); -- 2.30.2