Add target_ops argument to to_upload_trace_state_variables

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

	* target.h (struct target_ops) <to_upload_trace_state_variables>:
	Add argument.
	(target_upload_trace_state_variables): Add argument.
	* target.c (update_current_target): Update.
	* remote.c (remote_upload_trace_state_variables): Add 'self'
	argument.
	(remote_start_remote): Update.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3227be17c9a681214c741ae952492e16b99e2de6..0d53cdb6d7cc44001dc1513794917eb0e17ebfd3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_upload_trace_state_variables>:
+       Add argument.
+       (target_upload_trace_state_variables): Add argument.
+       * target.c (update_current_target): Update.
+       * remote.c (remote_upload_trace_state_variables): Add 'self'
+       argument.
+       (remote_start_remote): Update.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_upload_tracepoints>: Add

diff --git a/gdb/remote.c b/gdb/remote.c
index e514a7b31aad677147c366eec6c92831c7c3eb36..869a320c82914897c773362da2bf368ebd572349 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -205,7 +205,8 @@ static int remote_get_trace_status (struct target_ops *self,
 static int remote_upload_tracepoints (struct target_ops *self,
                                      struct uploaded_tp **utpp);
 
-static int remote_upload_trace_state_variables (struct uploaded_tsv **utsvp);
+static int remote_upload_trace_state_variables (struct target_ops *self,
+                                               struct uploaded_tsv **utsvp);
   
 static void remote_query_supported (void);
 
@@ -3443,7 +3444,7 @@ remote_start_remote (int from_tty, struct target_ops *target, int extended_p)
     {
       struct uploaded_tsv *uploaded_tsvs = NULL;
 
-      remote_upload_trace_state_variables (&uploaded_tsvs);
+      remote_upload_trace_state_variables (target, &uploaded_tsvs);
       merge_uploaded_trace_state_variables (&uploaded_tsvs);
     }
 
@@ -11673,7 +11674,8 @@ remote_upload_tracepoints (struct target_ops *self, struct uploaded_tp **utpp)
 }
 
 static int
-remote_upload_trace_state_variables (struct uploaded_tsv **utsvp)
+remote_upload_trace_state_variables (struct target_ops *self,
+                                    struct uploaded_tsv **utsvp)
 {
   struct remote_state *rs = get_remote_state ();
   char *p;

diff --git a/gdb/target.c b/gdb/target.c
index 9954d7ae89550be955f772c683b00ed1428f0de3..ab596dcbdff88ebf8ecedb059bfed84f9e885e36 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -896,7 +896,7 @@ update_current_target (void)
            (int (*) (struct target_ops *, struct uploaded_tp **))
            return_zero);
   de_fault (to_upload_trace_state_variables,
-           (int (*) (struct uploaded_tsv **))
+           (int (*) (struct target_ops *, struct uploaded_tsv **))
            return_zero);
   de_fault (to_get_raw_trace_data,
            (LONGEST (*) (gdb_byte *, ULONGEST, LONGEST))

diff --git a/gdb/target.h b/gdb/target.h
index 7d2614675d878aad31cd07783764857492af71c7..d4b539bd8215deb5676d210f77fec74e5771a337 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -816,7 +816,8 @@ struct target_ops
     int (*to_upload_tracepoints) (struct target_ops *,
                                  struct uploaded_tp **utpp);
 
-    int (*to_upload_trace_state_variables) (struct uploaded_tsv **utsvp);
+    int (*to_upload_trace_state_variables) (struct target_ops *,
+                                           struct uploaded_tsv **utsvp);
 
     LONGEST (*to_get_raw_trace_data) (gdb_byte *buf,
                                      ULONGEST offset, LONGEST len);
@@ -1836,7 +1837,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_upload_tracepoints) (&current_target, utpp)
 
 #define target_upload_trace_state_variables(utsvp) \
-  (*current_target.to_upload_trace_state_variables) (utsvp)
+  (*current_target.to_upload_trace_state_variables) (&current_target, utsvp)
 
 #define target_get_raw_trace_data(buf,offset,len) \
   (*current_target.to_get_raw_trace_data) ((buf), (offset), (len))