Add target_ops argument to to_traceframe_info

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

	* tracepoint.c (tfile_traceframe_info): Add 'self' argument.
	* target.h (struct target_ops) <to_traceframe_info>: 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ff760265c178c44d07904e055f06c73ae8ac869..07b9bf44976a0ba93bd855bcbe646396a44c0337 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * tracepoint.c (tfile_traceframe_info): Add 'self' argument.
+       * target.h (struct target_ops) <to_traceframe_info>: 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  <tromey@redhat.com>
 
        * target.h (target_static_tracepoint_markers_by_strid): Add

diff --git a/gdb/ctf.c b/gdb/ctf.c
index 79575a78991f58ef4e029252a2f9f576b0a099e4..8777014e220fa9d991bf8665cae6ad4081fc8e9a 100644 (file)
--- 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 f47a86251e9144de768eeba0c762541fcf784f52..f92a658792cccb04e9415ef93db878cb868b873d 100644 (file)
--- 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 6c72235a6c3cd1dfe999ef82ed966fb8bb03ccf6..05b2e4b487bd5c9052a90d9559073d04f500335e 100644 (file)
--- 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 11fa311bdd1a62a8552acbce71d3fe1b2385b055..2c248a6240e59054a966bcc54510f2638b0092c1 100644 (file)
--- 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) (&current_target)
 
 #define target_use_agent(use) \
   (*current_target.to_use_agent) (use)

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 9021de00f27cc0c175eef8714f2336ec5e4248ce..de4f6af2524c6ca849c8af8275525046343526cc 100644 (file)
--- 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);