diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-12-18 14:04:27 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2014-02-19 07:47:48 -0700 |
| commit | 25da2e807e5aa1a19df0b39561d4eefcbac51503 (patch) | |
| tree | 5c4110ed1ccd761460e261d1b4f020db7d128b5f /gdb | |
| parent | 86dd181d454a0b975bebafae1893d6ae236c8649 (diff) | |
| download | gdb-25da2e807e5aa1a19df0b39561d4eefcbac51503.zip gdb-25da2e807e5aa1a19df0b39561d4eefcbac51503.tar.gz gdb-25da2e807e5aa1a19df0b39561d4eefcbac51503.tar.bz2 | |
convert to_trace_start
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_trace_start.
* target.h (struct target_ops) <to_trace_start>: Use
TARGET_DEFAULT_NORETURN.
Diffstat (limited to 'gdb')
| -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 f2c9efd..0302dbf 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_trace_start. + * target.h (struct target_ops) <to_trace_start>: 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_trace_set_readonly_regions. * target.h (struct target_ops) <to_trace_set_readonly_regions>: Use TARGET_DEFAULT_NORETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 14ebff1..c5b2763 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -728,6 +728,19 @@ tdefault_trace_set_readonly_regions (struct target_ops *self) tcomplain (); } +static void +delegate_trace_start (struct target_ops *self) +{ + self = self->beneath; + self->to_trace_start (self); +} + +static void +tdefault_trace_start (struct target_ops *self) +{ + tcomplain (); +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -870,6 +883,8 @@ install_delegators (struct target_ops *ops) ops->to_disable_tracepoint = delegate_disable_tracepoint; if (ops->to_trace_set_readonly_regions == NULL) 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_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -940,5 +955,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_enable_tracepoint = tdefault_enable_tracepoint; 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_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 0880cf1..cbf18e4 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -695,7 +695,7 @@ update_current_target (void) /* Do not inherit to_enable_tracepoint. */ /* Do not inherit to_disable_tracepoint. */ /* Do not inherit to_trace_set_readonly_regions. */ - INHERIT (to_trace_start, t); + /* Do not inherit to_trace_start. */ INHERIT (to_get_trace_status, t); INHERIT (to_get_tracepoint_status, t); INHERIT (to_trace_stop, 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_trace_start, - (void (*) (struct target_ops *)) - tcomplain); de_fault (to_get_trace_status, (int (*) (struct target_ops *, struct trace_status *)) return_minus_one); diff --git a/gdb/target.h b/gdb/target.h index e5a75d0..07ec080 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -836,7 +836,8 @@ struct target_ops TARGET_DEFAULT_NORETURN (tcomplain ()); /* Start a trace run. */ - void (*to_trace_start) (struct target_ops *); + void (*to_trace_start) (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); |