Add target_ops argument to to_trace_find

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

	* tracepoint.c (tfile_trace_find): Add 'self' argument.
	* target.h (struct target_ops) <to_trace_find>: Add argument.
	(target_trace_find): Add argument.
	* target.c (update_current_target): Update.
	* remote.c (remote_trace_find): Add 'self' argument.
	* ctf.c (ctf_trace_find): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd76ca690329648cd460322585067bdfe8b24e9f..67e84941e1078a901560fe95e09d5da62430f534 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * tracepoint.c (tfile_trace_find): Add 'self' argument.
+       * target.h (struct target_ops) <to_trace_find>: Add argument.
+       (target_trace_find): Add argument.
+       * target.c (update_current_target): Update.
+       * remote.c (remote_trace_find): Add 'self' argument.
+       * ctf.c (ctf_trace_find): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_trace_stop>: Add argument.

diff --git a/gdb/ctf.c b/gdb/ctf.c
index b31c987efb219d214a111aec57b437f50059e037..b2b0e865ec4cde170311343f2f95f5d5d84a2c5b 100644 (file)
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -1633,7 +1633,7 @@ ctf_get_traceframe_address (void)
    number in it.  Return traceframe number when matched.  */
 
 static int
-ctf_trace_find (enum trace_find_type type, int num,
+ctf_trace_find (struct target_ops *self, enum trace_find_type type, int num,
                CORE_ADDR addr1, CORE_ADDR addr2, int *tpp)
 {
   int ret = -1;

diff --git a/gdb/remote.c b/gdb/remote.c
index 74f0b77dcb53eaa8f7bc17a6acc6cb80c2db3cf7..509e8b37238ca6f3bf00056138a0c8cc997fc1ce 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10831,7 +10831,8 @@ remote_trace_stop (struct target_ops *self)
 }
 
 static int
-remote_trace_find (enum trace_find_type type, int num,
+remote_trace_find (struct target_ops *self,
+                  enum trace_find_type type, int num,
                   CORE_ADDR addr1, CORE_ADDR addr2,
                   int *tpp)
 {

diff --git a/gdb/target.c b/gdb/target.c
index 6eaa70b92d941cf18a0456aed3c05ac4d1dbf412..56036f9376e56ed4896621b64bfea289663aa653 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -883,7 +883,8 @@ update_current_target (void)
            (void (*) (struct target_ops *))
            tcomplain);
   de_fault (to_trace_find,
-           (int (*) (enum trace_find_type, int, CORE_ADDR, CORE_ADDR, int *))
+           (int (*) (struct target_ops *,
+                     enum trace_find_type, int, CORE_ADDR, CORE_ADDR, int *))
            return_minus_one);
   de_fault (to_get_trace_state_variable_value,
            (int (*) (int, LONGEST *))

diff --git a/gdb/target.h b/gdb/target.h
index 33377eb77318b7c6c8c592e3cae169fa14c9db04..0754050998c57a0132414f949e4cc4b114bd09e0 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -801,7 +801,8 @@ struct target_ops
       number of the trace frame, and also the tracepoint number at
       TPP.  If no trace frame matches, return -1.  May throw if the
       operation fails.  */
-    int (*to_trace_find) (enum trace_find_type type, int num,
+    int (*to_trace_find) (struct target_ops *,
+                         enum trace_find_type type, int num,
                          CORE_ADDR addr1, CORE_ADDR addr2, int *tpp);
 
     /* Get the value of the trace state variable number TSV, returning
@@ -1819,7 +1820,8 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_trace_stop) (&current_target)
 
 #define target_trace_find(type,num,addr1,addr2,tpp) \
-  (*current_target.to_trace_find) ((type), (num), (addr1), (addr2), (tpp))
+  (*current_target.to_trace_find) (&current_target, \
+                                  (type), (num), (addr1), (addr2), (tpp))
 
 #define target_get_trace_state_variable_value(tsv,val) \
   (*current_target.to_get_trace_state_variable_value) ((tsv), (val))

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 6698dd6e131dd4bb1d1c721ff186901954423034..5d034b5767c1e937cda1ecc1253b7cc920b8c86a 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -4839,7 +4839,7 @@ tfile_get_traceframe_address (off_t tframe_offset)
    each.  */
 
 static int
-tfile_trace_find (enum trace_find_type type, int num,
+tfile_trace_find (struct target_ops *self, enum trace_find_type type, int num,
                  CORE_ADDR addr1, CORE_ADDR addr2, int *tpp)
 {
   short tpnum;