[PATCH] convert to_thread_address_space to use TARGET_DEFAULT_FUNC

[PATCH] convert to_thread_address_space to use TARGET_DEFAULT_FUNC

[Tom Tromey]

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-05-21  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.
---
 gdb/ChangeLog          |  8 ++++++++
 gdb/target-delegates.c | 10 ++++++++++
 gdb/target.c           | 46 ++++++++++++++++++++++++----------------------
 gdb/target.h           |  3 ++-
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c
index 0e95cf0..e6fbb44 100644
--- 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 71292d3..067091c 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -77,6 +77,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 *);
@@ -2589,30 +2592,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));
@@ -2626,6 +2609,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 9371529..f8e5e3a 100644
--- 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.  */
 
-- 
1.9.0

Re: [PATCH] convert to_thread_address_space to use TARGET_DEFAULT_FUNC

[Pedro Alves]

On 05/21/2014 04:20 PM, Tom Tromey wrote:
> 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-05-21  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.

Looks fine.

Thanks,
-- 
Pedro Alves

Re: [PATCH] convert to_thread_address_space to use TARGET_DEFAULT_FUNC

[Tom Tromey]

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Tom> This converts to_thread_address_space to use TARGET_DEFAULT_FUNC.
Tom> This method was one of a handful not using the normal target
Tom> delegation approach.  The only rationale here is consistency in the
Tom> target vector.

I've rebased this to master, re-tested, and I am now checking it in.

Tom