From 4072d4ff86a32410cb7073eafa5dca07e88ecc69 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:06:18 -0700 Subject: [PATCH] convert to_get_trace_status 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_get_trace_status. * 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 0302dbf52f7..44aa4c151ba 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_get_trace_status. + * 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 c5b2763ef78..cb56a3ce92d 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -741,6 +741,19 @@ tdefault_trace_start (struct target_ops *self) tcomplain (); } +static int +delegate_get_trace_status (struct target_ops *self, struct trace_status *arg1) +{ + self = self->beneath; + return self->to_get_trace_status (self, arg1); +} + +static int +tdefault_get_trace_status (struct target_ops *self, struct trace_status *arg1) +{ + return -1; +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -885,6 +898,8 @@ install_delegators (struct target_ops *ops) ops->to_trace_set_readonly_regions = delegate_trace_set_readonly_regions; if (ops->to_trace_start == NULL) ops->to_trace_start = delegate_trace_start; + if (ops->to_get_trace_status == NULL) + ops->to_get_trace_status = delegate_get_trace_status; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -956,5 +971,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_disable_tracepoint = tdefault_disable_tracepoint; ops->to_trace_set_readonly_regions = tdefault_trace_set_readonly_regions; ops->to_trace_start = tdefault_trace_start; + ops->to_get_trace_status = tdefault_get_trace_status; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index cbf18e49c5b..4d9fa4ce03d 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -696,7 +696,7 @@ update_current_target (void) /* Do not inherit to_disable_tracepoint. */ /* Do not inherit to_trace_set_readonly_regions. */ /* Do not inherit to_trace_start. */ - INHERIT (to_get_trace_status, t); + /* Do not inherit to_get_trace_status. */ INHERIT (to_get_tracepoint_status, t); INHERIT (to_trace_stop, t); INHERIT (to_trace_find, 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_get_trace_status, - (int (*) (struct target_ops *, struct trace_status *)) - return_minus_one); de_fault (to_get_tracepoint_status, (void (*) (struct target_ops *, struct breakpoint *, struct uploaded_tp *)) diff --git a/gdb/target.h b/gdb/target.h index 07ec08036f9..85aba11d473 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -840,7 +840,8 @@ struct target_ops TARGET_DEFAULT_NORETURN (tcomplain ()); /* Get the current status of a tracing run. */ - int (*to_get_trace_status) (struct target_ops *, struct trace_status *ts); + int (*to_get_trace_status) (struct target_ops *, struct trace_status *ts) + TARGET_DEFAULT_RETURN (-1); void (*to_get_tracepoint_status) (struct target_ops *, struct breakpoint *tp, -- 2.30.2