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.
This commit is contained in:
Tom Tromey 2013-12-18 14:02:30 -07:00
parent 151f70f10e
commit 05c41993a6
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_disable_tracepoint.
* target.h (struct target_ops) <to_disable_tracepoint>: Use
TARGET_DEFAULT_NORETURN.
2014-02-19 Tom Tromey <tromey@redhat.com> 2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild. * target-delegates.c: Rebuild.

View file

@ -702,6 +702,19 @@ tdefault_enable_tracepoint (struct target_ops *self, struct bp_location *arg1)
tcomplain (); 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 static int
delegate_supports_btrace (struct target_ops *self) 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; ops->to_download_trace_state_variable = delegate_download_trace_state_variable;
if (ops->to_enable_tracepoint == NULL) if (ops->to_enable_tracepoint == NULL)
ops->to_enable_tracepoint = delegate_enable_tracepoint; 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) if (ops->to_supports_btrace == NULL)
ops->to_supports_btrace = delegate_supports_btrace; 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_can_download_tracepoint = tdefault_can_download_tracepoint;
ops->to_download_trace_state_variable = tdefault_download_trace_state_variable; ops->to_download_trace_state_variable = tdefault_download_trace_state_variable;
ops->to_enable_tracepoint = tdefault_enable_tracepoint; ops->to_enable_tracepoint = tdefault_enable_tracepoint;
ops->to_disable_tracepoint = tdefault_disable_tracepoint;
ops->to_supports_btrace = tdefault_supports_btrace; ops->to_supports_btrace = tdefault_supports_btrace;
} }

View file

@ -693,7 +693,7 @@ update_current_target (void)
/* Do not inherit to_can_download_tracepoint. */ /* Do not inherit to_can_download_tracepoint. */
/* Do not inherit to_download_trace_state_variable. */ /* Do not inherit to_download_trace_state_variable. */
/* Do not inherit to_enable_tracepoint. */ /* 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_set_readonly_regions, t);
INHERIT (to_trace_start, t); INHERIT (to_trace_start, t);
INHERIT (to_get_trace_status, t); INHERIT (to_get_trace_status, t);
@ -752,9 +752,6 @@ update_current_target (void)
(void (*) (struct target_ops *, ptid_t)) (void (*) (struct target_ops *, ptid_t))
target_ignore); target_ignore);
current_target.to_read_description = NULL; 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, de_fault (to_trace_set_readonly_regions,
(void (*) (struct target_ops *)) (void (*) (struct target_ops *))
tcomplain); tcomplain);

View file

@ -826,7 +826,8 @@ struct target_ops
/* Disable a tracepoint on the target. */ /* Disable a tracepoint on the target. */
void (*to_disable_tracepoint) (struct target_ops *, 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 /* Inform the target info of memory regions that are readonly
(such as text sections), and so it should return data from (such as text sections), and so it should return data from