From 0bcfeddf50f6d36d429b4546d5082debf2e5e05e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 18 Dec 2013 14:12:29 -0700 Subject: [PATCH] convert to_set_disconnected_tracing 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default to_set_disconnected_tracing. * target.h (struct target_ops) : Use TARGET_DEFAULT_IGNORE. --- gdb/ChangeLog | 8 ++++++++ gdb/target-delegates.c | 15 +++++++++++++++ gdb/target.c | 5 +---- gdb/target.h | 3 ++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 57dfaf2..31219b6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -2,6 +2,14 @@ * target-delegates.c: Rebuild. * target.c (update_current_target): Don't inherit or default + to_set_disconnected_tracing. + * target.h (struct target_ops) : Use + TARGET_DEFAULT_IGNORE. + +2014-02-19 Tom Tromey + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default to_get_min_fast_tracepoint_insn_len. (return_minus_one): Remove. * target.h (struct target_ops) diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index ae9e567..d82b4bf 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -871,6 +871,18 @@ tdefault_get_min_fast_tracepoint_insn_len (struct target_ops *self) return -1; } +static void +delegate_set_disconnected_tracing (struct target_ops *self, int arg1) +{ + self = self->beneath; + self->to_set_disconnected_tracing (self, arg1); +} + +static void +tdefault_set_disconnected_tracing (struct target_ops *self, int arg1) +{ +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -1035,6 +1047,8 @@ install_delegators (struct target_ops *ops) ops->to_get_raw_trace_data = delegate_get_raw_trace_data; if (ops->to_get_min_fast_tracepoint_insn_len == NULL) ops->to_get_min_fast_tracepoint_insn_len = delegate_get_min_fast_tracepoint_insn_len; + if (ops->to_set_disconnected_tracing == NULL) + ops->to_set_disconnected_tracing = delegate_set_disconnected_tracing; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1116,5 +1130,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_upload_trace_state_variables = tdefault_upload_trace_state_variables; ops->to_get_raw_trace_data = tdefault_get_raw_trace_data; ops->to_get_min_fast_tracepoint_insn_len = tdefault_get_min_fast_tracepoint_insn_len; + ops->to_set_disconnected_tracing = tdefault_set_disconnected_tracing; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index bfbf5fd..e6ba817 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -704,7 +704,7 @@ update_current_target (void) /* Do not inherit to_upload_trace_state_variables. */ /* Do not inherit to_get_raw_trace_data. */ /* Do not inherit to_get_min_fast_tracepoint_insn_len. */ - INHERIT (to_set_disconnected_tracing, t); + /* Do not inherit to_set_disconnected_tracing. */ INHERIT (to_set_circular_trace_buffer, t); INHERIT (to_set_trace_buffer_size, t); INHERIT (to_set_trace_notes, t); @@ -750,9 +750,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); current_target.to_read_description = NULL; - de_fault (to_set_disconnected_tracing, - (void (*) (struct target_ops *, int)) - target_ignore); de_fault (to_set_circular_trace_buffer, (void (*) (struct target_ops *, int)) target_ignore); diff --git a/gdb/target.h b/gdb/target.h index 3cdb028..91d0c34 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -893,7 +893,8 @@ struct target_ops /* Set the target's tracing behavior in response to unexpected disconnection - set VAL to 1 to keep tracing, 0 to stop. */ - void (*to_set_disconnected_tracing) (struct target_ops *, int val); + void (*to_set_disconnected_tracing) (struct target_ops *, int val) + TARGET_DEFAULT_IGNORE (); void (*to_set_circular_trace_buffer) (struct target_ops *, int val); /* Set the size of trace buffer in the target. */ void (*to_set_trace_buffer_size) (struct target_ops *, LONGEST val); -- 2.7.4