From a893e81f187e3ffd69a90bd8181571628f74794e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:44:57 -0700 Subject: [PATCH] Add target_ops argument to to_traceframe_info 2014-02-19 Tom Tromey * tracepoint.c (tfile_traceframe_info): Add 'self' argument. * target.h (struct target_ops) : Add argument. (target_traceframe_info): Add argument. * target.c (update_current_target): Update. * remote.c (remote_traceframe_info): Add 'self' argument. * ctf.c (ctf_traceframe_info): Add 'self' argument. --- gdb/ChangeLog | 9 +++++++++ gdb/ctf.c | 2 +- gdb/remote.c | 2 +- gdb/target.c | 2 +- gdb/target.h | 4 ++-- gdb/tracepoint.c | 2 +- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ff760265c..07b9bf4497 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2014-02-19 Tom Tromey + + * tracepoint.c (tfile_traceframe_info): Add 'self' argument. + * target.h (struct target_ops) : Add argument. + (target_traceframe_info): Add argument. + * target.c (update_current_target): Update. + * remote.c (remote_traceframe_info): Add 'self' argument. + * ctf.c (ctf_traceframe_info): Add 'self' argument. + 2014-02-19 Tom Tromey * target.h (target_static_tracepoint_markers_by_strid): Add diff --git a/gdb/ctf.c b/gdb/ctf.c index 79575a7899..8777014e22 100644 --- a/gdb/ctf.c +++ b/gdb/ctf.c @@ -1768,7 +1768,7 @@ ctf_thread_alive (struct target_ops *ops, ptid_t ptid) traceframe_info. */ static struct traceframe_info * -ctf_traceframe_info (void) +ctf_traceframe_info (struct target_ops *self) { struct traceframe_info *info = XCNEW (struct traceframe_info); const char *name; diff --git a/gdb/remote.c b/gdb/remote.c index f47a86251e..f92a658792 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -11054,7 +11054,7 @@ remote_set_circular_trace_buffer (struct target_ops *self, int val) } static struct traceframe_info * -remote_traceframe_info (void) +remote_traceframe_info (struct target_ops *self) { char *text; diff --git a/gdb/target.c b/gdb/target.c index 6c72235a6c..05b2e4b487 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -932,7 +932,7 @@ update_current_target (void) const char *)) tcomplain); de_fault (to_traceframe_info, - (struct traceframe_info * (*) (void)) + (struct traceframe_info * (*) (struct target_ops *)) return_null); de_fault (to_supports_evaluation_of_breakpoint_conditions, (int (*) (struct target_ops *)) diff --git a/gdb/target.h b/gdb/target.h index 11fa311bdd..2c248a6240 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -888,7 +888,7 @@ struct target_ops is available in the read-only sections. This method should not cache data; higher layers take care of caching, invalidating, and re-fetching when necessary. */ - struct traceframe_info *(*to_traceframe_info) (void); + struct traceframe_info *(*to_traceframe_info) (struct target_ops *); /* Ask the target to use or not to use agent according to USE. Return 1 successful, 0 otherwise. */ @@ -1876,7 +1876,7 @@ extern char *target_fileio_read_stralloc (const char *filename); marker_id) #define target_traceframe_info() \ - (*current_target.to_traceframe_info) () + (*current_target.to_traceframe_info) (¤t_target) #define target_use_agent(use) \ (*current_target.to_use_agent) (use) diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 9021de00f2..de4f6af252 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -5328,7 +5328,7 @@ build_traceframe_info (char blocktype, void *data) } static struct traceframe_info * -tfile_traceframe_info (void) +tfile_traceframe_info (struct target_ops *self) { struct traceframe_info *info = XCNEW (struct traceframe_info); -- 2.34.1