FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

convert to_trace_find

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_trace_find.
	* target.h (struct target_ops): Use TARGET_DEFAULT_RETURN.
This commit is contained in:
Tom Tromey 2013-12-18 14:08:14 -07:00
parent e51c07ea4a
commit afc94e66d4
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gdb/ChangeLog
View file

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

16
gdb/target-delegates.c
View file

@ -780,6 +780,19 @@ tdefault_trace_stop (struct target_ops *self)
tcomplain (); tcomplain ();
} }
static int
delegate_trace_find (struct target_ops *self, enum trace_find_type arg1, int arg2, CORE_ADDR arg3, CORE_ADDR arg4, int *arg5)
{
self = self->beneath;
return self->to_trace_find (self, arg1, arg2, arg3, arg4, arg5);
}
static int
tdefault_trace_find (struct target_ops *self, enum trace_find_type arg1, int arg2, CORE_ADDR arg3, CORE_ADDR arg4, int *arg5)
{
return -1;
}
static int static int
delegate_supports_btrace (struct target_ops *self) delegate_supports_btrace (struct target_ops *self)
{ {
@ -930,6 +943,8 @@ install_delegators (struct target_ops *ops)
ops->to_get_tracepoint_status = delegate_get_tracepoint_status; ops->to_get_tracepoint_status = delegate_get_tracepoint_status;
if (ops->to_trace_stop == NULL) if (ops->to_trace_stop == NULL)
ops->to_trace_stop = delegate_trace_stop; ops->to_trace_stop = delegate_trace_stop;
if (ops->to_trace_find == NULL)
ops->to_trace_find = delegate_trace_find;
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;
} }
@ -1004,5 +1019,6 @@ install_dummy_methods (struct target_ops *ops)
ops->to_get_trace_status = tdefault_get_trace_status; ops->to_get_trace_status = tdefault_get_trace_status;
ops->to_get_tracepoint_status = tdefault_get_tracepoint_status; ops->to_get_tracepoint_status = tdefault_get_tracepoint_status;
ops->to_trace_stop = tdefault_trace_stop; ops->to_trace_stop = tdefault_trace_stop;
ops->to_trace_find = tdefault_trace_find;
ops->to_supports_btrace = tdefault_supports_btrace; ops->to_supports_btrace = tdefault_supports_btrace;
} }

6
gdb/target.c
View file

@ -699,7 +699,7 @@ update_current_target (void)
/* Do not inherit to_get_trace_status. */ /* Do not inherit to_get_trace_status. */
/* Do not inherit to_get_tracepoint_status. */ /* Do not inherit to_get_tracepoint_status. */
/* Do not inherit to_trace_stop. */ /* Do not inherit to_trace_stop. */
INHERIT (to_trace_find, t); /* Do not inherit to_trace_find. */
INHERIT (to_get_trace_state_variable_value, t); INHERIT (to_get_trace_state_variable_value, t);
INHERIT (to_save_trace_data, t); INHERIT (to_save_trace_data, t);
INHERIT (to_upload_tracepoints, t); INHERIT (to_upload_tracepoints, t);
@ -752,10 +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_trace_find,
(int (*) (struct target_ops *,
enum trace_find_type, int, CORE_ADDR, CORE_ADDR, int *))
return_minus_one);
de_fault (to_get_trace_state_variable_value, de_fault (to_get_trace_state_variable_value,
(int (*) (struct target_ops *, int, LONGEST *)) (int (*) (struct target_ops *, int, LONGEST *))
return_zero); return_zero);

3
gdb/target.h
View file

@ -859,7 +859,8 @@ struct target_ops
operation fails. */ operation fails. */
int (*to_trace_find) (struct target_ops *, int (*to_trace_find) (struct target_ops *,
enum trace_find_type type, int num, enum trace_find_type type, int num,
CORE_ADDR addr1, CORE_ADDR addr2, int *tpp); CORE_ADDR addr1, CORE_ADDR addr2, int *tpp)
TARGET_DEFAULT_RETURN (-1);
/* Get the value of the trace state variable number TSV, returning /* Get the value of the trace state variable number TSV, returning
1 if the value is known and writing the value itself into the 1 if the value is known and writing the value itself into the