From c686c57f020c9b20ea120ec19cacce773ae789de Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:44:45 -0700 Subject: [PATCH] Add target_ops argument to to_static_tracepoint_markers_by_strid 2014-02-19 Tom Tromey * target.h (target_static_tracepoint_markers_by_strid): Add argument. (struct target_ops) : Add 'self' argument. * target.c (update_current_target): Update. * remote.c (struct target_ops) : Add 'self' argument. * linux-nat.c (struct target_ops) : Add 'self' argument. --- gdb/ChangeLog | 12 ++++++++++++ gdb/linux-nat.c | 3 ++- gdb/remote.c | 3 ++- gdb/target.c | 3 ++- gdb/target.h | 5 +++-- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 78c0ae179f3..4ff760265c1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2014-02-19 Tom Tromey + + * target.h (target_static_tracepoint_markers_by_strid): Add + argument. + (struct target_ops) : Add + 'self' argument. + * target.c (update_current_target): Update. + * remote.c (struct target_ops) + : Add 'self' argument. + * linux-nat.c (struct target_ops) + : Add 'self' argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index ff800a9a667..446bf09fe62 100644 --- 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 2adf0db071e..f47a86251e9 100644 --- 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 7bbfeeb163d..6c72235a6c3 100644 --- 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 d4f8fd1ceab..11fa311bdd1 100644 --- 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) (¤t_target, \ + marker_id) #define target_traceframe_info() \ (*current_target.to_traceframe_info) () -- 2.30.2