From ab6617cc1b3d544e14fdfb0df0ea21c0a7fcc5f4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:42:29 -0700 Subject: [PATCH] Add target_ops argument to to_upload_tracepoints 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. (target_upload_tracepoints): Add argument. * target.c (update_current_target): Update. * remote.c (remote_upload_tracepoints): Add 'self' argument. (remote_start_remote): Update. --- gdb/ChangeLog | 9 +++++++++ gdb/remote.c | 7 ++++--- gdb/target.c | 2 +- gdb/target.h | 5 +++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b639af8..3227be1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2014-02-19 Tom Tromey + * target.h (struct target_ops) : Add + argument. + (target_upload_tracepoints): Add argument. + * target.c (update_current_target): Update. + * remote.c (remote_upload_tracepoints): Add 'self' argument. + (remote_start_remote): Update. + +2014-02-19 Tom Tromey + * target.h (struct target_ops) : Add argument. (target_save_trace_data): Add argument. * target.c (update_current_target): Update. diff --git a/gdb/remote.c b/gdb/remote.c index b518174..e514a7b 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -202,7 +202,8 @@ struct remote_state; static int remote_get_trace_status (struct target_ops *self, struct trace_status *ts); -static int remote_upload_tracepoints (struct uploaded_tp **utpp); +static int remote_upload_tracepoints (struct target_ops *self, + struct uploaded_tp **utpp); static int remote_upload_trace_state_variables (struct uploaded_tsv **utsvp); @@ -3614,7 +3615,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p) if (current_trace_status ()->running) printf_filtered (_("Trace is already running on the target.\n")); - remote_upload_tracepoints (&uploaded_tps); + remote_upload_tracepoints (target, &uploaded_tps); merge_uploaded_tracepoints (&uploaded_tps); } @@ -11651,7 +11652,7 @@ remote_new_objfile (struct objfile *objfile) collection. */ static int -remote_upload_tracepoints (struct uploaded_tp **utpp) +remote_upload_tracepoints (struct target_ops *self, struct uploaded_tp **utpp) { struct remote_state *rs = get_remote_state (); char *p; diff --git a/gdb/target.c b/gdb/target.c index 75e3a8a..9954d7a 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -893,7 +893,7 @@ update_current_target (void) (int (*) (struct target_ops *, const char *)) tcomplain); de_fault (to_upload_tracepoints, - (int (*) (struct uploaded_tp **)) + (int (*) (struct target_ops *, struct uploaded_tp **)) return_zero); de_fault (to_upload_trace_state_variables, (int (*) (struct uploaded_tsv **)) diff --git a/gdb/target.h b/gdb/target.h index 638931d..7d26146 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -813,7 +813,8 @@ struct target_ops int (*to_save_trace_data) (struct target_ops *, const char *filename); - int (*to_upload_tracepoints) (struct uploaded_tp **utpp); + int (*to_upload_tracepoints) (struct target_ops *, + struct uploaded_tp **utpp); int (*to_upload_trace_state_variables) (struct uploaded_tsv **utsvp); @@ -1832,7 +1833,7 @@ extern char *target_fileio_read_stralloc (const char *filename); (*current_target.to_save_trace_data) (¤t_target, filename) #define target_upload_tracepoints(utpp) \ - (*current_target.to_upload_tracepoints) (utpp) + (*current_target.to_upload_tracepoints) (¤t_target, utpp) #define target_upload_trace_state_variables(utsvp) \ (*current_target.to_upload_trace_state_variables) (utsvp) -- 2.7.4