convert to_get_trace_status

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_get_trace_status.
	* target.h (struct target_ops) <to_get_trace_status>: Use
	TARGET_DEFAULT_RETURN.
This commit is contained in:
Tom Tromey 2013-12-18 14:06:18 -07:00
parent 25da2e807e
commit 4072d4ff86
4 changed files with 27 additions and 5 deletions

View File

@ -1,3 +1,11 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (update_current_target): Don't inherit or default
to_get_trace_status.
* target.h (struct target_ops) <to_get_trace_status>: Use
TARGET_DEFAULT_RETURN.
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.

View File

@ -741,6 +741,19 @@ tdefault_trace_start (struct target_ops *self)
tcomplain ();
}
static int
delegate_get_trace_status (struct target_ops *self, struct trace_status *arg1)
{
self = self->beneath;
return self->to_get_trace_status (self, arg1);
}
static int
tdefault_get_trace_status (struct target_ops *self, struct trace_status *arg1)
{
return -1;
}
static int
delegate_supports_btrace (struct target_ops *self)
{
@ -885,6 +898,8 @@ install_delegators (struct target_ops *ops)
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_get_trace_status == NULL)
ops->to_get_trace_status = delegate_get_trace_status;
if (ops->to_supports_btrace == NULL)
ops->to_supports_btrace = delegate_supports_btrace;
}
@ -956,5 +971,6 @@ install_dummy_methods (struct target_ops *ops)
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_get_trace_status = tdefault_get_trace_status;
ops->to_supports_btrace = tdefault_supports_btrace;
}

View File

@ -696,7 +696,7 @@ update_current_target (void)
/* Do not inherit to_disable_tracepoint. */
/* Do not inherit to_trace_set_readonly_regions. */
/* Do not inherit to_trace_start. */
INHERIT (to_get_trace_status, t);
/* Do not inherit to_get_trace_status. */
INHERIT (to_get_tracepoint_status, t);
INHERIT (to_trace_stop, t);
INHERIT (to_trace_find, 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_get_trace_status,
(int (*) (struct target_ops *, struct trace_status *))
return_minus_one);
de_fault (to_get_tracepoint_status,
(void (*) (struct target_ops *, struct breakpoint *,
struct uploaded_tp *))

View File

@ -840,7 +840,8 @@ 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);
int (*to_get_trace_status) (struct target_ops *, struct trace_status *ts)
TARGET_DEFAULT_RETURN (-1);
void (*to_get_tracepoint_status) (struct target_ops *,
struct breakpoint *tp,