diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/target-delegates.c | 16 | ||||
| -rw-r--r-- | gdb/target.c | 5 | ||||
| -rw-r--r-- | gdb/target.h | 3 |
4 files changed, 27 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 82e4973..44b1a96 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_get_trace_state_variable_value. + * target.h (struct target_ops) + <to_get_trace_state_variable_value>: Use TARGET_DEFAULT_RETURN. + +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. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 2fd51e2..4c934e7 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -794,6 +794,19 @@ tdefault_trace_find (struct target_ops *self, enum trace_find_type arg1, int ar } static int +delegate_get_trace_state_variable_value (struct target_ops *self, int arg1, LONGEST *arg2) +{ + self = self->beneath; + return self->to_get_trace_state_variable_value (self, arg1, arg2); +} + +static int +tdefault_get_trace_state_variable_value (struct target_ops *self, int arg1, LONGEST *arg2) +{ + return 0; +} + +static int delegate_supports_btrace (struct target_ops *self) { self = self->beneath; @@ -945,6 +958,8 @@ install_delegators (struct target_ops *ops) ops->to_trace_stop = delegate_trace_stop; if (ops->to_trace_find == NULL) ops->to_trace_find = delegate_trace_find; + if (ops->to_get_trace_state_variable_value == NULL) + ops->to_get_trace_state_variable_value = delegate_get_trace_state_variable_value; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1020,5 +1035,6 @@ install_dummy_methods (struct target_ops *ops) 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_get_trace_state_variable_value = tdefault_get_trace_state_variable_value; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 9ef0762..f0309f1 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -700,7 +700,7 @@ update_current_target (void) /* Do not inherit to_get_tracepoint_status. */ /* Do not inherit to_trace_stop. */ /* Do not inherit to_trace_find. */ - INHERIT (to_get_trace_state_variable_value, t); + /* Do not inherit to_get_trace_state_variable_value. */ INHERIT (to_save_trace_data, t); INHERIT (to_upload_tracepoints, t); INHERIT (to_upload_trace_state_variables, t); @@ -752,9 +752,6 @@ update_current_target (void) (void (*) (struct target_ops *, ptid_t)) target_ignore); current_target.to_read_description = NULL; - de_fault (to_get_trace_state_variable_value, - (int (*) (struct target_ops *, int, LONGEST *)) - return_zero); de_fault (to_save_trace_data, (int (*) (struct target_ops *, const char *)) tcomplain); diff --git a/gdb/target.h b/gdb/target.h index f85ec56..4331b91 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -866,7 +866,8 @@ struct target_ops 1 if the value is known and writing the value itself into the location pointed to by VAL, else returning 0. */ int (*to_get_trace_state_variable_value) (struct target_ops *, - int tsv, LONGEST *val); + int tsv, LONGEST *val) + TARGET_DEFAULT_RETURN (0); int (*to_save_trace_data) (struct target_ops *, const char *filename); |