Add target_ops argument to to_get_tib_address

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

	* windows-nat.c (windows_get_tib_address): Add 'self' argument.
	* target.h (struct target_ops) <to_get_tib_address>: Add argument.
	(target_get_tib_address): Add argument.
	* target.c (update_current_target): Update.
	* remote.c (remote_get_tib_address): Add 'self' argument.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c9cf31c629ac9ca3a95574013a5a1a9ccef350ca..108c750ca66fd8d9bf037c183b0dc69743878598 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * windows-nat.c (windows_get_tib_address): Add 'self' argument.
+       * target.h (struct target_ops) <to_get_tib_address>: Add argument.
+       (target_get_tib_address): Add argument.
+       * target.c (update_current_target): Update.
+       * remote.c (remote_get_tib_address): Add 'self' argument.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target.h (struct target_ops) <to_set_trace_notes>: Add argument.

diff --git a/gdb/remote.c b/gdb/remote.c
index 1e33ed7e66d6aab4beb3261db43d631baccc3cc7..bd420aa16996c663dedb9f033b0772700d462dca 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -9320,7 +9320,7 @@ remote_get_thread_local_address (struct target_ops *ops,
    Returns 1 if ptid is found and thread_local_base is non zero.  */
 
 static int
-remote_get_tib_address (ptid_t ptid, CORE_ADDR *addr)
+remote_get_tib_address (struct target_ops *self, ptid_t ptid, CORE_ADDR *addr)
 {
   if (remote_protocol_packets[PACKET_qGetTIBAddr].support != PACKET_DISABLE)
     {

diff --git a/gdb/target.c b/gdb/target.c
index d61d10091b3ee647325c64ab28a71d6cde6a08f7..e020add615b946a3ac8ddc97a860d8d71b39b4c5 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -918,7 +918,7 @@ update_current_target (void)
                      const char *, const char *, const char *))
            return_zero);
   de_fault (to_get_tib_address,
-           (int (*) (ptid_t, CORE_ADDR *))
+           (int (*) (struct target_ops *, ptid_t, CORE_ADDR *))
            tcomplain);
   de_fault (to_set_permissions,
            (void (*) (void))

diff --git a/gdb/target.h b/gdb/target.h
index 1acd7196dd622cf4b40a6f986d6e34cc47487b60..d4620f358c62f25df6ed8a06781497cab16f1714 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -859,7 +859,8 @@ struct target_ops
 
     /* Return the address of the start of the Thread Information Block
        a Windows OS specific feature.  */
-    int (*to_get_tib_address) (ptid_t ptid, CORE_ADDR *addr);
+    int (*to_get_tib_address) (struct target_ops *,
+                              ptid_t ptid, CORE_ADDR *addr);
 
     /* Send the new settings of write permission variables.  */
     void (*to_set_permissions) (void);
@@ -1861,7 +1862,7 @@ extern char *target_fileio_read_stralloc (const char *filename);
                                        (user), (notes), (stopnotes))
 
 #define target_get_tib_address(ptid, addr) \
-  (*current_target.to_get_tib_address) ((ptid), (addr))
+  (*current_target.to_get_tib_address) (&current_target, (ptid), (addr))
 
 #define target_set_permissions() \
   (*current_target.to_set_permissions) ()

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 164b53f6fee0545d8adb5a3c43b2dfba3bf77827..e0dac7ba7f30455a5eb1a5ca6bcefad48141d601 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -2570,7 +2570,8 @@ windows_xfer_partial (struct target_ops *ops, enum target_object object,
    Returns 1 if ptid is found and sets *ADDR to thread_local_base.  */
 
 static int
-windows_get_tib_address (ptid_t ptid, CORE_ADDR *addr)
+windows_get_tib_address (struct target_ops *self,
+                        ptid_t ptid, CORE_ADDR *addr)
 {
   thread_info *th;