Add target_ops argument to to_upload_tracepoints

2014-02-19  Tom Tromey  <tromey@redhat.com>

	* target.h (struct target_ops) <to_upload_tracepoints>: 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b639af851f1e887c787e30f680934759fbb71dce..3227be17c9a681214c741ae952492e16b99e2de6 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_upload_tracepoints>: 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  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_save_trace_data>: Add argument.

diff --git a/gdb/remote.c b/gdb/remote.c
index b518174d7db8f9557c36a32cd3f8e65a49d35a1b..e514a7b31aad677147c366eec6c92831c7c3eb36 100644 (file)
--- 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 75e3a8aa4a5696d3d155c79aabc010ff2e4efd8e..9954d7ae89550be955f772c683b00ed1428f0de3 100644 (file)
--- 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 638931d6f6351a571d9482687e8b1a01eae2d1ae..7d2614675d878aad31cd07783764857492af71c7 100644 (file)
--- 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) (&current_target, filename)
 
 #define target_upload_tracepoints(utpp) \
-  (*current_target.to_upload_tracepoints) (utpp)
+  (*current_target.to_upload_tracepoints) (&current_target, utpp)
 
 #define target_upload_trace_state_variables(utsvp) \
   (*current_target.to_upload_trace_state_variables) (utsvp)