diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-12-18 14:01:51 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:47:45 -0700 |
| commit | 151f70f10ef35a1d6fba1c78d0108b371b5f8b29 (patch) | |
| tree | 286b2c221574cb70b8a0945c38dfa158c9ff66c8 | |
| parent | 94eb98b974f70f4d6e28e3af6f4a3cdc31c15f3b (diff) | |
| download | gdb-151f70f10ef35a1d6fba1c78d0108b371b5f8b29.zip gdb-151f70f10ef35a1d6fba1c78d0108b371b5f8b29.tar.gz gdb-151f70f10ef35a1d6fba1c78d0108b371b5f8b29.tar.bz2 | |
convert to_enable_tracepoint
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.
| -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 5823590..fb67ce3 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_enable_tracepoint. + * target.h (struct target_ops) <to_enable_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_download_trace_state_variable. * target.h (struct target_ops) <to_download_trace_state_variable>: Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index c158538..3e9ea0f 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -689,6 +689,19 @@ tdefault_download_trace_state_variable (struct target_ops *self, struct trace_st tcomplain (); } +static void +delegate_enable_tracepoint (struct target_ops *self, struct bp_location *arg1) +{ + self = self->beneath; + self->to_enable_tracepoint (self, arg1); +} + +static void +tdefault_enable_tracepoint (struct target_ops *self, struct bp_location *arg1) +{ + tcomplain (); +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -825,6 +838,8 @@ install_delegators (struct target_ops *ops) ops->to_can_download_tracepoint = delegate_can_download_tracepoint; if (ops->to_download_trace_state_variable == NULL) 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_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -892,5 +907,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_download_tracepoint = tdefault_download_tracepoint; 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_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 358cc56..0e3a223 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -692,7 +692,7 @@ update_current_target (void) /* Do not inherit to_download_tracepoint. */ /* Do not inherit to_can_download_tracepoint. */ /* Do not inherit to_download_trace_state_variable. */ - INHERIT (to_enable_tracepoint, t); + /* Do not inherit to_enable_tracepoint. */ INHERIT (to_disable_tracepoint, t); INHERIT (to_trace_set_readonly_regions, t); INHERIT (to_trace_start, 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_enable_tracepoint, - (void (*) (struct target_ops *, struct bp_location *)) - tcomplain); de_fault (to_disable_tracepoint, (void (*) (struct target_ops *, struct bp_location *)) tcomplain); diff --git a/gdb/target.h b/gdb/target.h index 584d3c5..d38fd2c 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -821,7 +821,8 @@ struct target_ops /* Enable a tracepoint on the target. */ void (*to_enable_tracepoint) (struct target_ops *, - struct bp_location *location); + struct bp_location *location) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Disable a tracepoint on the target. */ void (*to_disable_tracepoint) (struct target_ops *, |