From 05c41993a6001ca281dc5eb35f44d0c064bfb913 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:02:30 -0700 Subject: [PATCH] convert to_disable_tracepoint 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_disable_tracepoint. * 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 fb67ce371d..013e87836f 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_disable_tracepoint. + * 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 3e9ea0fcbd..062424d29b 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -702,6 +702,19 @@ tdefault_enable_tracepoint (struct target_ops *self, struct bp_location *arg1) tcomplain (); } +static void +delegate_disable_tracepoint (struct target_ops *self, struct bp_location *arg1) +{ + self = self->beneath; + self->to_disable_tracepoint (self, arg1); +} + +static void +tdefault_disable_tracepoint (struct target_ops *self, struct bp_location *arg1) +{ + tcomplain (); +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -840,6 +853,8 @@ install_delegators (struct target_ops *ops) ops->to_download_trace_state_variable = delegate_download_trace_state_variable; if (ops->to_enable_tracepoint == NULL) ops->to_enable_tracepoint = delegate_enable_tracepoint; + if (ops->to_disable_tracepoint == NULL) + ops->to_disable_tracepoint = delegate_disable_tracepoint; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -908,5 +923,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_can_download_tracepoint = tdefault_can_download_tracepoint; ops->to_download_trace_state_variable = tdefault_download_trace_state_variable; ops->to_enable_tracepoint = tdefault_enable_tracepoint; + ops->to_disable_tracepoint = tdefault_disable_tracepoint; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 0e3a223ca7..c337877c99 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -693,7 +693,7 @@ update_current_target (void) /* Do not inherit to_can_download_tracepoint. */ /* Do not inherit to_download_trace_state_variable. */ /* Do not inherit to_enable_tracepoint. */ - INHERIT (to_disable_tracepoint, t); + /* Do not inherit to_disable_tracepoint. */ INHERIT (to_trace_set_readonly_regions, t); INHERIT (to_trace_start, t); INHERIT (to_get_trace_status, 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_disable_tracepoint, - (void (*) (struct target_ops *, struct bp_location *)) - tcomplain); de_fault (to_trace_set_readonly_regions, (void (*) (struct target_ops *)) tcomplain); diff --git a/gdb/target.h b/gdb/target.h index d38fd2cf84..826bcb3f92 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -826,7 +826,8 @@ struct target_ops /* Disable a tracepoint on the target. */ void (*to_disable_tracepoint) (struct target_ops *, - struct bp_location *location); + struct bp_location *location) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Inform the target info of memory regions that are readonly (such as text sections), and so it should return data from