convert to_read_btrace

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

	* target-delegates.c: Rebuild.
	* target.c (target_read_btrace): Unconditionally delegate.
	* target.h (struct target_ops) <to_read_btrace>: Use
	TARGET_DEFAULT_NORETURN.
This commit is contained in:
Tom Tromey 2013-12-19 08:19:02 -07:00
parent 9ace480d62
commit eb5b20d490
4 changed files with 26 additions and 9 deletions

View File

@ -1,3 +1,10 @@
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.
* target.c (target_read_btrace): Unconditionally delegate.
* target.h (struct target_ops) <to_read_btrace>: Use
TARGET_DEFAULT_NORETURN.
2014-02-19 Tom Tromey <tromey@redhat.com>
* target-delegates.c: Rebuild.

View File

@ -1326,6 +1326,19 @@ tdefault_teardown_btrace (struct target_ops *self, struct btrace_target_info *ar
tcomplain ();
}
static enum btrace_error
delegate_read_btrace (struct target_ops *self, VEC (btrace_block_s) **arg1, struct btrace_target_info *arg2, enum btrace_read_type arg3)
{
self = self->beneath;
return self->to_read_btrace (self, arg1, arg2, arg3);
}
static enum btrace_error
tdefault_read_btrace (struct target_ops *self, VEC (btrace_block_s) **arg1, struct btrace_target_info *arg2, enum btrace_read_type arg3)
{
tcomplain ();
}
static void
delegate_save_record (struct target_ops *self, const char *arg1)
{
@ -1722,6 +1735,8 @@ install_delegators (struct target_ops *ops)
ops->to_disable_btrace = delegate_disable_btrace;
if (ops->to_teardown_btrace == NULL)
ops->to_teardown_btrace = delegate_teardown_btrace;
if (ops->to_read_btrace == NULL)
ops->to_read_btrace = delegate_read_btrace;
if (ops->to_save_record == NULL)
ops->to_save_record = delegate_save_record;
if (ops->to_delete_record == NULL)
@ -1865,6 +1880,7 @@ install_dummy_methods (struct target_ops *ops)
ops->to_supports_btrace = tdefault_supports_btrace;
ops->to_disable_btrace = tdefault_disable_btrace;
ops->to_teardown_btrace = tdefault_teardown_btrace;
ops->to_read_btrace = tdefault_read_btrace;
ops->to_save_record = tdefault_save_record;
ops->to_delete_record = tdefault_delete_record;
ops->to_record_is_replaying = tdefault_record_is_replaying;

View File

@ -3817,14 +3817,7 @@ target_read_btrace (VEC (btrace_block_s) **btrace,
struct btrace_target_info *btinfo,
enum btrace_read_type type)
{
struct target_ops *t;
for (t = current_target.beneath; t != NULL; t = t->beneath)
if (t->to_read_btrace != NULL)
return t->to_read_btrace (t, btrace, btinfo, type);
tcomplain ();
return BTRACE_ERR_NOT_SUPPORTED;
return current_target.to_read_btrace (&current_target, btrace, btinfo, type);
}
/* See target.h. */

View File

@ -1023,7 +1023,8 @@ struct target_ops
enum btrace_error (*to_read_btrace) (struct target_ops *self,
VEC (btrace_block_s) **data,
struct btrace_target_info *btinfo,
enum btrace_read_type type);
enum btrace_read_type type)
TARGET_DEFAULT_NORETURN (tcomplain ());
/* Stop trace recording. */
void (*to_stop_recording) (struct target_ops *);