From 6fea14cd31245114ab9a48a4134790e826be2a24 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:06:52 -0700 Subject: [PATCH] convert to_get_tracepoint_status 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_get_tracepoint_status. * target.h (struct target_ops) : Use TARGET_DEFAULT_NORETURN. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 6 +----- gdb/target.h | 3 ++- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 44aa4c151b..9c294de0c2 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_tracepoint_status. + * 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 cb56a3ce92..898ee446da 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -754,6 +754,19 @@ tdefault_get_trace_status (struct target_ops *self, struct trace_status *arg1) return -1; } +static void +delegate_get_tracepoint_status (struct target_ops *self, struct breakpoint *arg1, struct uploaded_tp *arg2) +{ + self = self->beneath; + self->to_get_tracepoint_status (self, arg1, arg2); +} + +static void +tdefault_get_tracepoint_status (struct target_ops *self, struct breakpoint *arg1, struct uploaded_tp *arg2) +{ + tcomplain (); +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -900,6 +913,8 @@ install_delegators (struct target_ops *ops) 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_get_tracepoint_status == NULL) + ops->to_get_tracepoint_status = delegate_get_tracepoint_status; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -972,5 +987,6 @@ install_dummy_methods (struct target_ops *ops) 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_get_tracepoint_status = tdefault_get_tracepoint_status; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 4d9fa4ce03..6da6cf823b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -697,7 +697,7 @@ update_current_target (void) /* Do not inherit to_trace_set_readonly_regions. */ /* Do not inherit to_trace_start. */ /* Do not inherit to_get_trace_status. */ - INHERIT (to_get_tracepoint_status, t); + /* Do not inherit to_get_tracepoint_status. */ INHERIT (to_trace_stop, t); INHERIT (to_trace_find, t); INHERIT (to_get_trace_state_variable_value, t); @@ -752,10 +752,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); current_target.to_read_description = NULL; - de_fault (to_get_tracepoint_status, - (void (*) (struct target_ops *, struct breakpoint *, - struct uploaded_tp *)) - tcomplain); de_fault (to_trace_stop, (void (*) (struct target_ops *)) tcomplain); diff --git a/gdb/target.h b/gdb/target.h index 85aba11d47..2caa891e39 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -845,7 +845,8 @@ struct target_ops void (*to_get_tracepoint_status) (struct target_ops *, struct breakpoint *tp, - struct uploaded_tp *utp); + struct uploaded_tp *utp) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Stop a trace run. */ void (*to_trace_stop) (struct target_ops *);