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 056e56b..d560ad6 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_raw_trace_data. + * target.h (struct target_ops) <to_get_raw_trace_data>: Use + TARGET_DEFAULT_NORETURN. + +2014-02-19 Tom Tromey <tromey@redhat.com> + + * target-delegates.c: Rebuild. + * target.c (update_current_target): Don't inherit or default to_upload_trace_state_variables. * target.h (struct target_ops) <to_upload_trace_state_variables>: Use TARGET_DEFAULT_RETURN. diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 4d5ca99..cdf2905 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -845,6 +845,19 @@ tdefault_upload_trace_state_variables (struct target_ops *self, struct uploaded_ return 0; } +static LONGEST +delegate_get_raw_trace_data (struct target_ops *self, gdb_byte *arg1, ULONGEST arg2, LONGEST arg3) +{ + self = self->beneath; + return self->to_get_raw_trace_data (self, arg1, arg2, arg3); +} + +static LONGEST +tdefault_get_raw_trace_data (struct target_ops *self, gdb_byte *arg1, ULONGEST arg2, LONGEST arg3) +{ + tcomplain (); +} + static int delegate_supports_btrace (struct target_ops *self) { @@ -1005,6 +1018,8 @@ install_delegators (struct target_ops *ops) ops->to_upload_tracepoints = delegate_upload_tracepoints; if (ops->to_upload_trace_state_variables == NULL) ops->to_upload_trace_state_variables = delegate_upload_trace_state_variables; + if (ops->to_get_raw_trace_data == NULL) + ops->to_get_raw_trace_data = delegate_get_raw_trace_data; if (ops->to_supports_btrace == NULL) ops->to_supports_btrace = delegate_supports_btrace; } @@ -1084,5 +1099,6 @@ install_dummy_methods (struct target_ops *ops) ops->to_save_trace_data = tdefault_save_trace_data; ops->to_upload_tracepoints = tdefault_upload_tracepoints; ops->to_upload_trace_state_variables = tdefault_upload_trace_state_variables; + ops->to_get_raw_trace_data = tdefault_get_raw_trace_data; ops->to_supports_btrace = tdefault_supports_btrace; } diff --git a/gdb/target.c b/gdb/target.c index 38d8dda..8caa720 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -704,7 +704,7 @@ update_current_target (void) /* Do not inherit to_save_trace_data. */ /* Do not inherit to_upload_tracepoints. */ /* Do not inherit to_upload_trace_state_variables. */ - INHERIT (to_get_raw_trace_data, t); + /* Do not inherit to_get_raw_trace_data. */ INHERIT (to_get_min_fast_tracepoint_insn_len, t); INHERIT (to_set_disconnected_tracing, t); INHERIT (to_set_circular_trace_buffer, 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_raw_trace_data, - (LONGEST (*) (struct target_ops *, gdb_byte *, ULONGEST, LONGEST)) - tcomplain); de_fault (to_get_min_fast_tracepoint_insn_len, (int (*) (struct target_ops *)) return_minus_one); diff --git a/gdb/target.h b/gdb/target.h index 11e716c..9fe5991 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -881,7 +881,8 @@ struct target_ops TARGET_DEFAULT_RETURN (0); LONGEST (*to_get_raw_trace_data) (struct target_ops *, gdb_byte *buf, - ULONGEST offset, LONGEST len); + ULONGEST offset, LONGEST len) + TARGET_DEFAULT_NORETURN (tcomplain ()); /* Get the minimum length of instruction on which a fast tracepoint may be set on the target. If this operation is unsupported, |