Add target_ops argument to to_static_tracepoint_markers_by_strid

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

	* target.h (target_static_tracepoint_markers_by_strid): Add
	argument.
	(struct target_ops) <to_static_tracepoint_markers_by_strid>: Add
	'self' argument.
	* target.c (update_current_target): Update.
	* remote.c (struct target_ops)
	<to_static_tracepoint_markers_by_strid>: Add 'self' argument.
	* linux-nat.c (struct target_ops)
	<to_static_tracepoint_markers_by_strid>: Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 78c0ae179f3e83cbf6d093c75923b191bfeba000..4ff760265c178c44d07904e055f06c73ae8ac869 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (target_static_tracepoint_markers_by_strid): Add
+       argument.
+       (struct target_ops) <to_static_tracepoint_markers_by_strid>: Add
+       'self' argument.
+       * target.c (update_current_target): Update.
+       * remote.c (struct target_ops)
+       <to_static_tracepoint_markers_by_strid>: Add 'self' argument.
+       * linux-nat.c (struct target_ops)
+       <to_static_tracepoint_markers_by_strid>: Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_static_tracepoint_marker_at>:

diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index ff800a9a6679a17c1c7c2efa3222e36c0f1716c0..446bf09fe62bf34edcdd5d0e4a93b28c38209f46 100644 (file)
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -4429,7 +4429,8 @@ cleanup_target_stop (void *arg)
 }
 
 static VEC(static_tracepoint_marker_p) *
-linux_child_static_tracepoint_markers_by_strid (const char *strid)
+linux_child_static_tracepoint_markers_by_strid (struct target_ops *self,
+                                               const char *strid)
 {
   char s[IPA_CMD_BUF_SIZE];
   struct cleanup *old_chain;

diff --git a/gdb/remote.c b/gdb/remote.c
index 2adf0db071ebeeeef5377b74991c65738cfe543b..f47a86251e9144de768eeba0c762541fcf784f52 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2918,7 +2918,8 @@ remote_static_tracepoint_marker_at (struct target_ops *self, CORE_ADDR addr,
 }
 
 static VEC(static_tracepoint_marker_p) *
-remote_static_tracepoint_markers_by_strid (const char *strid)
+remote_static_tracepoint_markers_by_strid (struct target_ops *self,
+                                          const char *strid)
 {
   struct remote_state *rs = get_remote_state ();
   VEC(static_tracepoint_marker_p) *markers = NULL;

diff --git a/gdb/target.c b/gdb/target.c
index 7bbfeeb163dcb325934ba0193043327bccfaa044..6c72235a6c3cd1dfe999ef82ed966fb8bb03ccf6 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -928,7 +928,8 @@ update_current_target (void)
                      CORE_ADDR, struct static_tracepoint_marker *))
            return_zero);
   de_fault (to_static_tracepoint_markers_by_strid,
-           (VEC(static_tracepoint_marker_p) * (*) (const char *))
+           (VEC(static_tracepoint_marker_p) * (*) (struct target_ops *,
+                                                   const char *))
            tcomplain);
   de_fault (to_traceframe_info,
            (struct traceframe_info * (*) (void))

diff --git a/gdb/target.h b/gdb/target.h
index d4f8fd1ceab6f4a85136ad705b6625c457a50ebc..11fa311bdd1a62a8552acbce71d3fe1b2385b055 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -873,7 +873,7 @@ struct target_ops
     /* Return a vector of all tracepoints markers string id ID, or all
        markers if ID is NULL.  */
     VEC(static_tracepoint_marker_p) *(*to_static_tracepoint_markers_by_strid)
-      (const char *id);
+      (struct target_ops *, const char *id);
 
     /* Return a traceframe info object describing the current
        traceframe's contents.  If the target doesn't support
@@ -1872,7 +1872,8 @@ extern char *target_fileio_read_stralloc (const char *filename);
                                                    addr, marker)
 
 #define target_static_tracepoint_markers_by_strid(marker_id) \
-  (*current_target.to_static_tracepoint_markers_by_strid) (marker_id)
+  (*current_target.to_static_tracepoint_markers_by_strid) (&current_target, \
+                                                          marker_id)
 
 #define target_traceframe_info() \
   (*current_target.to_traceframe_info) ()