From: Tom Tromey Date: Wed, 18 Dec 2013 21:19:04 +0000 (-0700) Subject: convert to_can_use_agent X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9a7d8b4812687f9fed3e495024b166f04af44def;p=binutils-gdb.git convert to_can_use_agent 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_can_use_agent. * target.h (struct target_ops) : Use TARGET_DEFAULT_RETURN. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7289c28c9d1..5b76e527f82 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default + to_can_use_agent. + * 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 204b91ec7e3..8e11dfde573 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -997,6 +997,19 @@ tdefault_use_agent (struct target_ops *self, int arg1) tcomplain (); } +static int +delegate_can_use_agent (struct target_ops *self) +{ + self = self->beneath; + return self->to_can_use_agent (self); +} + +static int +tdefault_can_use_agent (struct target_ops *self) +{ + return 0; +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -1181,6 +1194,8 @@ install_delegators (struct target_ops *ops) ops->to_traceframe_info = delegate_traceframe_info; if (ops->to_use_agent == NULL) ops->to_use_agent = delegate_use_agent; + if (ops->to_can_use_agent == NULL) + ops->to_can_use_agent = delegate_can_use_agent; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1272,5 +1287,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_static_tracepoint_markers_by_strid = tdefault_static_tracepoint_markers_by_strid; ops->to_traceframe_info = tdefault_traceframe_info; ops->to_use_agent = tdefault_use_agent; + ops->to_can_use_agent = tdefault_can_use_agent; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index a11cc911722..b874ce0f28b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -712,7 +712,7 @@ update_current_target (void) /* Do not inherit to_static_tracepoint_markers_by_strid. */ /* Do not inherit to_traceframe_info. */ /* Do not inherit to_use_agent. */ - INHERIT (to_can_use_agent, t); + /* Do not inherit to_can_use_agent. */ INHERIT (to_augmented_libraries_svr4_read, t); INHERIT (to_magic, t); INHERIT (to_supports_evaluation_of_breakpoint_conditions, t); @@ -754,9 +754,6 @@ update_current_target (void) de_fault (to_can_run_breakpoint_commands, (int (*) (struct target_ops *)) return_zero); - de_fault (to_can_use_agent, - (int (*) (struct target_ops *)) - return_zero); de_fault (to_augmented_libraries_svr4_read, (int (*) (struct target_ops *)) return_zero); diff --git a/gdb/target.h b/gdb/target.h index 4cc20cfde74..c891192e574 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -967,7 +967,8 @@ struct target_ops TARGET_DEFAULT_NORETURN (tcomplain ()); /* Is the target able to use agent in current state? */ - int (*to_can_use_agent) (struct target_ops *); + int (*to_can_use_agent) (struct target_ops *) + TARGET_DEFAULT_RETURN (0); /* Check whether the target supports branch tracing. */ int (*to_supports_btrace) (struct target_ops *)