convert to_thread_address_space to use TARGET_DEFAULT_FUNC

This converts to_thread_address_space to use TARGET_DEFAULT_FUNC.

This method was one of a handful not using the normal target
delegation approach.  The only rationale here is consistency in the
target vector.

Built and regtested on x86-64 Fedora 20.

2014-06-04  Tom Tromey  <tromey@redhat.com>

	* target-delegates.c: Rebuild.
	* target.c (default_thread_address_space): New function.
	(target_thread_address_space): Simplify.
	* target.h (struct target_ops) <to_thread_address_space>: Add
	TARGET_DEFAULT_FUNC.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d09a07f1f856d34e8c9b32b60aa46d5a1dfb5176..8698393c808bf235b9c14528fd134f709f5e65f4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-04  Tom Tromey  <tromey@redhat.com>
+
+       * target-delegates.c: Rebuild.
+       * target.c (default_thread_address_space): New function.
+       (target_thread_address_space): Simplify.
+       * target.h (struct target_ops) <to_thread_address_space>: Add
+       TARGET_DEFAULT_FUNC.
+
 2014-06-04  Doug Evans  <xdje42@gmail.com>
 
        * guile/scm-type.c (type_smob): Remove duplicate typedef.

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 0e95cf07fb216726511408c3384888da8e0f51cf..e6fbb448937ab4594433c850579fa942399a9bd8 100644 (file)
--- a/gdb/target-delegates.c
+++ b/gdb/target-delegates.c
@@ -945,6 +945,13 @@ delegate_thread_architecture (struct target_ops *self, ptid_t arg1)
   return self->to_thread_architecture (self, arg1);
 }
 
+static struct address_space *
+delegate_thread_address_space (struct target_ops *self, ptid_t arg1)
+{
+  self = self->beneath;
+  return self->to_thread_address_space (self, arg1);
+}
+
 static void
 delegate_trace_init (struct target_ops *self)
 {
@@ -1782,6 +1789,8 @@ install_delegators (struct target_ops *ops)
     ops->to_can_run_breakpoint_commands = delegate_can_run_breakpoint_commands;
   if (ops->to_thread_architecture == NULL)
     ops->to_thread_architecture = delegate_thread_architecture;
+  if (ops->to_thread_address_space == NULL)
+    ops->to_thread_address_space = delegate_thread_address_space;
   if (ops->to_trace_init == NULL)
     ops->to_trace_init = delegate_trace_init;
   if (ops->to_download_tracepoint == NULL)
@@ -1974,6 +1983,7 @@ install_dummy_methods (struct target_ops *ops)
   ops->to_supports_evaluation_of_breakpoint_conditions = tdefault_supports_evaluation_of_breakpoint_conditions;
   ops->to_can_run_breakpoint_commands = tdefault_can_run_breakpoint_commands;
   ops->to_thread_architecture = default_thread_architecture;
+  ops->to_thread_address_space = default_thread_address_space;
   ops->to_trace_init = tdefault_trace_init;
   ops->to_download_tracepoint = tdefault_download_tracepoint;
   ops->to_can_download_tracepoint = tdefault_can_download_tracepoint;

diff --git a/gdb/target.c b/gdb/target.c
index cb154ab409b7623a14201ec951d10981b78e8f11..f73ab3c2b14cc091bf7b4f664591cc1321c0f285 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -78,6 +78,9 @@ static int default_verify_memory (struct target_ops *self,
                                  const gdb_byte *data,
                                  CORE_ADDR memaddr, ULONGEST size);
 
+static struct address_space *default_thread_address_space
+     (struct target_ops *self, ptid_t ptid);
+
 static void tcomplain (void) ATTRIBUTE_NORETURN;
 
 static int return_zero (struct target_ops *);
@@ -2610,30 +2613,10 @@ target_get_osdata (const char *type)
   return target_read_stralloc (t, TARGET_OBJECT_OSDATA, type);
 }
 
-/* Determine the current address space of thread PTID.  */
-
-struct address_space *
-target_thread_address_space (ptid_t ptid)
+static struct address_space *
+default_thread_address_space (struct target_ops *self, ptid_t ptid)
 {
-  struct address_space *aspace;
   struct inferior *inf;
-  struct target_ops *t;
-
-  for (t = current_target.beneath; t != NULL; t = t->beneath)
-    {
-      if (t->to_thread_address_space != NULL)
-       {
-         aspace = t->to_thread_address_space (t, ptid);
-         gdb_assert (aspace);
-
-         if (targetdebug)
-           fprintf_unfiltered (gdb_stdlog,
-                               "target_thread_address_space (%s) = %d\n",
-                               target_pid_to_str (ptid),
-                               address_space_num (aspace));
-         return aspace;
-       }
-    }
 
   /* Fall-back to the "main" address space of the inferior.  */
   inf = find_inferior_pid (ptid_get_pid (ptid));
@@ -2647,6 +2630,25 @@ target_thread_address_space (ptid_t ptid)
   return inf->aspace;
 }
 
+/* Determine the current address space of thread PTID.  */
+
+struct address_space *
+target_thread_address_space (ptid_t ptid)
+{
+  struct address_space *aspace;
+
+  aspace = current_target.to_thread_address_space (&current_target, ptid);
+  gdb_assert (aspace != NULL);
+
+  if (targetdebug)
+    fprintf_unfiltered (gdb_stdlog,
+                       "target_thread_address_space (%s) = %d\n",
+                       target_pid_to_str (ptid),
+                       address_space_num (aspace));
+
+  return aspace;
+}
+
 
 /* Target file operations.  */
 

diff --git a/gdb/target.h b/gdb/target.h
index face2107fbaa51f46b2982c57d255d5c6b074730..b0b9e89eda2229b480de9be81c705645af83010b 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -772,7 +772,8 @@ struct target_ops
        The default implementation always returns the inferior's
        address space.  */
     struct address_space *(*to_thread_address_space) (struct target_ops *,
-                                                     ptid_t);
+                                                     ptid_t)
+      TARGET_DEFAULT_FUNC (default_thread_address_space);
 
     /* Target file operations.  */