convert to_get_tib_address

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

	* target-delegates.c: Rebuild.
	* target.c (update_current_target): Don't inherit or default
	to_get_tib_address.
	* target.h (struct target_ops) <to_get_tib_address>: Use
	TARGET_DEFAULT_NORETURN.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8deed48464e69285cef09b3a3fdcb34486cafcdf..782b46a4b165b9559ae25187c686d17431f189dd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-02-19  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (update_current_target): Don't inherit or default
+       to_get_tib_address.
+       * target.h (struct target_ops) <to_get_tib_address>: Use
+       TARGET_DEFAULT_NORETURN.
+
 2014-02-19  Tom Tromey  <tromey@redhat.com>
 
        * target-delegates.c: Rebuild.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 562ccfdac229f989ad5ba5588ba66664725cd51e..ba89740a73072f8a7ec913ed86b77df4cee1e799 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -920,6 +920,19 @@ tdefault_set_trace_notes (struct target_ops *self, const char *arg1, const char
   return 0;
 }
 
+static int
+delegate_get_tib_address (struct target_ops *self, ptid_t arg1, CORE_ADDR *arg2)
+{
+  self = self->beneath;
+  return self->to_get_tib_address (self, arg1, arg2);
+}
+
+static int
+tdefault_get_tib_address (struct target_ops *self, ptid_t arg1, CORE_ADDR *arg2)
+{
+  tcomplain ();
+}
+
 static int
 delegate_supports_btrace (struct target_ops *self)
 {
@@ -1092,6 +1105,8 @@ install_delegators (struct target_ops *ops)
     ops->to_set_trace_buffer_size = delegate_set_trace_buffer_size;
   if (ops->to_set_trace_notes == NULL)
     ops->to_set_trace_notes = delegate_set_trace_notes;
+  if (ops->to_get_tib_address == NULL)
+    ops->to_get_tib_address = delegate_get_tib_address;
   if (ops->to_supports_btrace == NULL)
     ops->to_supports_btrace = delegate_supports_btrace;
 }
@@ -1177,5 +1192,6 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_set_circular_trace_buffer = tdefault_set_circular_trace_buffer;
   ops->to_set_trace_buffer_size = tdefault_set_trace_buffer_size;
   ops->to_set_trace_notes = tdefault_set_trace_notes;
+  ops->to_get_tib_address = tdefault_get_tib_address;
   ops->to_supports_btrace = tdefault_supports_btrace;
 }

diff --git a/gdb/target.c b/gdb/target.c
index e0b5efbfd2faa0585a3f4b647fcb97cbd582cdab..eb6d2bd30fdae25e51c15c2b9b985019d9ee7a51 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -708,7 +708,7 @@ update_current_target (void)
       /* Do not inherit to_set_circular_trace_buffer.  */
       /* Do not inherit to_set_trace_buffer_size.  */
       /* Do not inherit to_set_trace_notes.  */
-      INHERIT (to_get_tib_address, t);
+      /* Do not inherit to_get_tib_address.  */
       INHERIT (to_set_permissions, t);
       INHERIT (to_static_tracepoint_marker_at, t);
       INHERIT (to_static_tracepoint_markers_by_strid, t);
@@ -750,9 +750,6 @@ update_current_target (void)
            (void (*) (struct target_ops *, ptid_t))
            target_ignore);
   current_target.to_read_description = NULL;
-  de_fault (to_get_tib_address,
-           (int (*) (struct target_ops *, ptid_t, CORE_ADDR *))
-           tcomplain);
   de_fault (to_set_permissions,
            (void (*) (struct target_ops *))
            target_ignore);

diff --git a/gdb/target.h b/gdb/target.h
index a82a2dd58fb803b05fee4e9ee5cc7af4444125a1..7bc6d32c7628729234814acddf412b0b9c391800 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -927,7 +927,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) (struct target_ops *,
-                              ptid_t ptid, CORE_ADDR *addr);
+                              ptid_t ptid, CORE_ADDR *addr)
+      TARGET_DEFAULT_NORETURN (tcomplain ());
 
     /* Send the new settings of write permission variables.  */
     void (*to_set_permissions) (struct target_ops *);