Add target_ops argument to to_static_tracepoint_marker_at

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

	* target.h (struct target_ops) <to_static_tracepoint_marker_at>:
	Add argument.
	(target_static_tracepoint_marker_at): Add argument.
	* target.c (update_current_target): Update.
	* remote.c (remote_static_tracepoint_marker_at): Add 'self'
	argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2b9fa7f3103ca2b29f37bd598e87cf66364d058e..78c0ae179f3e83cbf6d093c75923b191bfeba000 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_static_tracepoint_marker_at>:
+       Add argument.
+       (target_static_tracepoint_marker_at): Add argument.
+       * target.c (update_current_target): Update.
+       * remote.c (remote_static_tracepoint_marker_at): Add 'self'
+       argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_set_permissions>: Add argument.

diff --git a/gdb/remote.c b/gdb/remote.c
index 7a62fdc569cb8575f5a74cebd05ae8b4e2c10de7..2adf0db071ebeeeef5377b74991c65738cfe543b 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2892,7 +2892,7 @@ remote_threads_extra_info (struct target_ops *self, struct thread_info *tp)
 \f
 
 static int
-remote_static_tracepoint_marker_at (CORE_ADDR addr,
+remote_static_tracepoint_marker_at (struct target_ops *self, CORE_ADDR addr,
                                    struct static_tracepoint_marker *marker)
 {
   struct remote_state *rs = get_remote_state ();

diff --git a/gdb/target.c b/gdb/target.c
index 2cf7055bb14060e139f346c3a53606f3efe03ee1..7bbfeeb163dcb325934ba0193043327bccfaa044 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -924,7 +924,8 @@ update_current_target (void)
            (void (*) (struct target_ops *))
            target_ignore);
   de_fault (to_static_tracepoint_marker_at,
-           (int (*) (CORE_ADDR, struct static_tracepoint_marker *))
+           (int (*) (struct target_ops *,
+                     CORE_ADDR, struct static_tracepoint_marker *))
            return_zero);
   de_fault (to_static_tracepoint_markers_by_strid,
            (VEC(static_tracepoint_marker_p) * (*) (const char *))

diff --git a/gdb/target.h b/gdb/target.h
index 8220d57428fea7f23fd27c37cba07a155efc1327..d4f8fd1ceab6f4a85136ad705b6625c457a50ebc 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -867,7 +867,7 @@ struct target_ops
 
     /* Look for a static tracepoint marker at ADDR, and fill in MARKER
        with its details.  Return 1 on success, 0 on failure.  */
-    int (*to_static_tracepoint_marker_at) (CORE_ADDR,
+    int (*to_static_tracepoint_marker_at) (struct target_ops *, CORE_ADDR,
                                           struct static_tracepoint_marker *marker);
 
     /* Return a vector of all tracepoints markers string id ID, or all
@@ -1868,7 +1868,8 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_set_permissions) (&current_target)
 
 #define target_static_tracepoint_marker_at(addr, marker) \
-  (*current_target.to_static_tracepoint_marker_at) (addr, marker)
+  (*current_target.to_static_tracepoint_marker_at) (&current_target,   \
+                                                   addr, marker)
 
 #define target_static_tracepoint_markers_by_strid(marker_id) \
   (*current_target.to_static_tracepoint_markers_by_strid) (marker_id)