Add target_ops argument to to_enable_btrace

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

	* target.h (struct target_ops) <to_enable_btrace>: Add argument.
	* target.c (target_enable_btrace): Add argument.
	* remote.c (remote_enable_btrace): Add 'self' argument.
	* i386-linux-nat.c (i386_linux_enable_btrace): Add 'self'
	argument.
	* amd64-linux-nat.c (amd64_linux_enable_btrace): Add 'self'
	argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 811a100f00e8f3244582a2f8a2f056778ad3ab52..d36e75a0d669a9ea11e57f41f999f66133efe5e9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target.h (struct target_ops) <to_enable_btrace>: Add argument.
+       * target.c (target_enable_btrace): Add argument.
+       * remote.c (remote_enable_btrace): Add 'self' argument.
+       * i386-linux-nat.c (i386_linux_enable_btrace): Add 'self'
+       argument.
+       * amd64-linux-nat.c (amd64_linux_enable_btrace): Add 'self'
+       argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_can_use_agent>: Add argument.

diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index af841420d2081456a1067e2fec54f0156ac20662..51f04769e4914e0ac00699ba078ead4ceb9128e8 100644 (file)
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -1150,7 +1150,7 @@ amd64_linux_read_description (struct target_ops *ops)
 /* Enable branch tracing.  */
 
 static struct btrace_target_info *
-amd64_linux_enable_btrace (ptid_t ptid)
+amd64_linux_enable_btrace (struct target_ops *self, ptid_t ptid)
 {
   struct btrace_target_info *tinfo;
   struct gdbarch *gdbarch;

diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index f7be40cee11cf513e3abbf960ecdbcaaa2f42e9d..8d6d92941a79e0121dbd6472919deb5aa380827d 100644 (file)
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -1061,7 +1061,7 @@ i386_linux_read_description (struct target_ops *ops)
 /* Enable branch tracing.  */
 
 static struct btrace_target_info *
-i386_linux_enable_btrace (ptid_t ptid)
+i386_linux_enable_btrace (struct target_ops *self, ptid_t ptid)
 {
   struct btrace_target_info *tinfo;
   struct gdbarch *gdbarch;

diff --git a/gdb/remote.c b/gdb/remote.c
index 03fd1c0982cacab7bc87a59ccdca9e8d75ddf578..b2a7992cc52695d492a281cf8dc85e473d52fed9 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -11243,7 +11243,7 @@ remote_supports_btrace (struct target_ops *self)
 /* Enable branch tracing.  */
 
 static struct btrace_target_info *
-remote_enable_btrace (ptid_t ptid)
+remote_enable_btrace (struct target_ops *self, ptid_t ptid)
 {
   struct btrace_target_info *tinfo = NULL;
   struct packet_config *packet = &remote_protocol_packets[PACKET_Qbtrace_bts];

diff --git a/gdb/target.c b/gdb/target.c
index 0a52b9e093362a3a80f8d63a6a9d5c1f15cd2195..be42e0cbbb1d2d06b594824eecc5e0b31e6269a0 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -4199,7 +4199,7 @@ target_enable_btrace (ptid_t ptid)
 
   for (t = current_target.beneath; t != NULL; t = t->beneath)
     if (t->to_enable_btrace != NULL)
-      return t->to_enable_btrace (ptid);
+      return t->to_enable_btrace (t, ptid);
 
   tcomplain ();
   return NULL;

diff --git a/gdb/target.h b/gdb/target.h
index 512a93027f3a0b7c86cde26e9e86e1ea664e59f5..83563949da517107e2a6a4ad0b3e94254a37c21b 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -903,7 +903,8 @@ struct target_ops
 
     /* Enable branch tracing for PTID and allocate a branch trace target
        information struct for reading and for disabling branch trace.  */
-    struct btrace_target_info *(*to_enable_btrace) (ptid_t ptid);
+    struct btrace_target_info *(*to_enable_btrace) (struct target_ops *,
+                                                   ptid_t ptid);
 
     /* Disable branch tracing and deallocate TINFO.  */
     void (*to_disable_btrace) (struct btrace_target_info *tinfo);