Add target_ops argument to to_disable_tracepoint

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

	* target.h (struct target_ops) <to_disable_tracepoint>: Add
	argument.
	(target_disable_tracepoint): Add argument.
	* target.c (update_current_target): Update.
	* remote.c (remote_disable_tracepoint): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fa4b5cfdbeb08cb303bb3e65b242f4ac9cae384f..5e1e2ae3afe8c93d041bab4c8211edb3ee3dc2e9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_disable_tracepoint>: Add
+       argument.
+       (target_disable_tracepoint): Add argument.
+       * target.c (update_current_target): Update.
+       * remote.c (remote_disable_tracepoint): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_enable_tracepoint>: Add

diff --git a/gdb/remote.c b/gdb/remote.c
index 0f8acf3e1d1e5730e22e5bb6e113ec8114e95f23..c7dd65c311f920cf367244952010e7b6eb003e5b 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -10643,7 +10643,8 @@ remote_enable_tracepoint (struct target_ops *self,
 }
 
 static void
-remote_disable_tracepoint (struct bp_location *location)
+remote_disable_tracepoint (struct target_ops *self,
+                          struct bp_location *location)
 {
   struct remote_state *rs = get_remote_state ();
   char addr_buf[40];

diff --git a/gdb/target.c b/gdb/target.c
index cbd090ac7a17e1017c4406056556f5646da8f5e2..69ee7562a3fc9b29dbf1099fbecb356cf8dc09f9 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -864,7 +864,7 @@ update_current_target (void)
            (void (*) (struct target_ops *, struct bp_location *))
            tcomplain);
   de_fault (to_disable_tracepoint,
-           (void (*) (struct bp_location *))
+           (void (*) (struct target_ops *, struct bp_location *))
            tcomplain);
   de_fault (to_trace_set_readonly_regions,
            (void (*) (void))

diff --git a/gdb/target.h b/gdb/target.h
index 2b0ee146e4035e4ceaef79cd50c81900951417ec..7e3ad87cb717d3676e3f46a719d01337099578bf 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -775,7 +775,8 @@ struct target_ops
                                  struct bp_location *location);
 
     /* Disable a tracepoint on the target.  */
-    void (*to_disable_tracepoint) (struct bp_location *location);
+    void (*to_disable_tracepoint) (struct target_ops *,
+                                  struct bp_location *location);
 
     /* Inform the target info of memory regions that are readonly
        (such as text sections), and so it should return data from
@@ -1799,7 +1800,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
   (*current_target.to_enable_tracepoint) (&current_target, loc)
 
 #define target_disable_tracepoint(loc) \
-  (*current_target.to_disable_tracepoint) (loc)
+  (*current_target.to_disable_tracepoint) (&current_target, loc)
 
 #define target_trace_start() \
   (*current_target.to_trace_start) ()