From 61fc905df366744e1501cccd7ba030f50e6c7850 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 17 Dec 2013 21:44:32 -0700
Subject: [PATCH] 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.
---
gdb/ChangeLog | 9 +++++++++
gdb/remote.c | 2 +-
gdb/target.c | 3 ++-
gdb/target.h | 5 +++--
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2b9fa7f3103..78c0ae179f3 100644
--- 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 7a62fdc569c..2adf0db071e 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -2892,7 +2892,7 @@ remote_threads_extra_info (struct target_ops *self, struct thread_info *tp)
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 2cf7055bb14..7bbfeeb163d 100644
--- 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 8220d57428f..d4f8fd1ceab 100644
--- 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) (¤t_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) (¤t_target, \
+ addr, marker)
#define target_static_tracepoint_markers_by_strid(marker_id) \
(*current_target.to_static_tracepoint_markers_by_strid) (marker_id)