From afc94e66d421055b1fc13995876c0880c8f626c7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:08:14 -0700 Subject: [PATCH] convert to_trace_find 2014-02-19 Tom Tromey * 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. --- gdb/ChangeLog | 7 +++++++ gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 6 +----- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a8c76c88ea5..82e4973b428 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2014-02-19 Tom Tromey + + * 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 * target-delegates.c: Rebuild. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 62fda4c7a13..2fd51e28974 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -780,6 +780,19 @@ tdefault_trace_stop (struct target_ops *self) 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 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; if (ops->to_trace_stop == NULL) 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) 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_tracepoint_status = tdefault_get_tracepoint_status; ops->to_trace_stop = tdefault_trace_stop; + ops->to_trace_find = tdefault_trace_find; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 02981e2b0e6..9ef0762f967 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -699,7 +699,7 @@ update_current_target (void) /* Do not inherit to_get_trace_status. */ /* Do not inherit to_get_tracepoint_status. */ /* 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_save_trace_data, t); INHERIT (to_upload_tracepoints, t); @@ -752,10 +752,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); 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, (int (*) (struct target_ops *, int, LONGEST *)) return_zero); diff --git a/gdb/target.h b/gdb/target.h index ad644a5ddf6..f85ec560d34 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -859,7 +859,8 @@ struct target_ops operation fails. */ int (*to_trace_find) (struct target_ops *, 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 1 if the value is known and writing the value itself into the -- 2.30.2