From 1e949b005fbc5a62ba4479a9861e861bc72de2a1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:10:14 -0700 Subject: [PATCH] convert to_upload_tracepoints 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_upload_tracepoints. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- 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 987d8b2d9e3..7275f1b2e4b 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_upload_tracepoints. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_RETURN. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index a1844d8ccfe..87feef0fd29 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -819,6 +819,19 @@ tdefault_save_trace_data (struct target_ops *self, const char *arg1) tcomplain (); } +static int +delegate_upload_tracepoints (struct target_ops *self, struct uploaded_tp **arg1) +{ + self = self->beneath; + return self->to_upload_tracepoints (self, arg1); +} + +static int +tdefault_upload_tracepoints (struct target_ops *self, struct uploaded_tp **arg1) +{ + return 0; +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -975,6 +988,8 @@ install_delegators (struct target_ops *ops) 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_upload_tracepoints == NULL) + ops->to_upload_tracepoints = delegate_upload_tracepoints; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1052,5 +1067,6 @@ install_dummy_methods (struct target_ops *ops) 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_upload_tracepoints = tdefault_upload_tracepoints; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 44900ed995d..e4061427249 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -702,7 +702,7 @@ update_current_target (void) /* Do not inherit to_trace_find. */ /* Do not inherit to_get_trace_state_variable_value. */ /* Do not inherit to_save_trace_data. */ - INHERIT (to_upload_tracepoints, t); + /* Do not inherit to_upload_tracepoints. */ INHERIT (to_upload_trace_state_variables, t); INHERIT (to_get_raw_trace_data, t); INHERIT (to_get_min_fast_tracepoint_insn_len, 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_upload_tracepoints, - (int (*) (struct target_ops *, struct uploaded_tp **)) - return_zero); de_fault (to_upload_trace_state_variables, (int (*) (struct target_ops *, struct uploaded_tsv **)) return_zero); diff --git a/gdb/target.h b/gdb/target.h index 9a7f3e4ae68..f1e08a4cf36 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -873,7 +873,8 @@ struct target_ops TARGET_DEFAULT_NORETURN (tcomplain ()); int (*to_upload_tracepoints) (struct target_ops *, - struct uploaded_tp **utpp); + struct uploaded_tp **utpp) + TARGET_DEFAULT_RETURN (0); int (*to_upload_trace_state_variables) (struct target_ops *, struct uploaded_tsv **utsvp); -- 2.30.2