diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-12-18 14:02:30 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:47:46 -0700 |
| commit | 05c41993a6001ca281dc5eb35f44d0c064bfb913 (patch) | |
| tree | cab7834c65913ae1d0d62fec0fc8d6937c954448 | |
| parent | 151f70f10ef35a1d6fba1c78d0108b371b5f8b29 (diff) | |
| download | gdb-05c41993a6001ca281dc5eb35f44d0c064bfb913.zip gdb-05c41993a6001ca281dc5eb35f44d0c064bfb913.tar.gz gdb-05c41993a6001ca281dc5eb35f44d0c064bfb913.tar.bz2 | |
convert to_disable_tracepoint
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_disable_tracepoint.
* target.h (struct target_ops) <to_disable_tracepoint>: Use
TARGET_DEFAULT_NORETURN.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 16 | ||||
| -rw-r--r-- | gdb/target.c | 5 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 27 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fb67ce3..013e878 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,14 @@ * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default + to_disable_tracepoint. + * target.h (struct target_ops) <to_disable_tracepoint>: Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default to_enable_tracepoint. * target.h (struct target_ops) <to_enable_tracepoint>: Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 3e9ea0f..062424d 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 0e3a223..c337877 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 d38fd2c..826bcb3 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 |