From 2117c711ae07700adb57ea5b5ca61e4c32d7e3d2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 13 Jan 2014 09:30:30 -0700 Subject: [PATCH] change delegation for to_read_description This switches to_read_description to the "new normal" delegation scheme. This one was a bit trickier than the other changes due to the way that target_read_description handled delegation. I examined all the target implementations of to_read_description and changed the ones returning NULL to instead delegate. 2014-02-19 Tom Tromey * arm-linux-nat.c (arm_linux_read_description): Delegate when needed. * corelow.c (core_read_description): Delegate when needed. * remote.c (remote_read_description): Delegate when needed. * target-delegates.c: Rebuild. * target.c (target_read_description): Rewrite. * target.h (struct target_ops) : Update comment. Use TARGET_DEFAULT_RETURN. --- gdb/ChangeLog | 11 +++++++++++ gdb/arm-linux-nat.c | 4 ++-- gdb/corelow.c | 12 +++++++++--- gdb/remote.c | 4 ++-- gdb/target-delegates.c | 16 ++++++++++++++++ gdb/target.c | 15 +-------------- gdb/target.h | 10 ++++++---- 7 files changed, 47 insertions(+), 25 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9db4fd456df..37aa3bfb37a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2014-02-19 Tom Tromey + + * arm-linux-nat.c (arm_linux_read_description): Delegate when + needed. + * corelow.c (core_read_description): Delegate when needed. + * remote.c (remote_read_description): Delegate when needed. + * target-delegates.c: Rebuild. + * target.c (target_read_description): Rewrite. + * target.h (struct target_ops) : Update + comment. Use TARGET_DEFAULT_RETURN. + 2014-02-19 Tom Tromey * target-delegates.c: Rebuild. diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c index 75f58ca4979..a92642d0721 100644 --- a/gdb/arm-linux-nat.c +++ b/gdb/arm-linux-nat.c @@ -636,7 +636,7 @@ arm_linux_read_description (struct target_ops *ops) if (target_auxv_search (ops, AT_HWCAP, &arm_hwcap) != 1) { - return NULL; + return ops->beneath->to_read_description (ops->beneath); } if (arm_hwcap & HWCAP_IWMMXT) @@ -681,7 +681,7 @@ arm_linux_read_description (struct target_ops *ops) return result; } - return NULL; + return ops->beneath->to_read_description (ops->beneath); } /* Information describing the hardware breakpoint capabilities. */ diff --git a/gdb/corelow.c b/gdb/corelow.c index 8a80be36ffa..05c3e4ea0c6 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -913,10 +913,16 @@ static const struct target_desc * core_read_description (struct target_ops *target) { if (core_gdbarch && gdbarch_core_read_description_p (core_gdbarch)) - return gdbarch_core_read_description (core_gdbarch, - target, core_bfd); + { + const struct target_desc *result; + + result = gdbarch_core_read_description (core_gdbarch, + target, core_bfd); + if (result != NULL) + return result; + } - return NULL; + return target->beneath->to_read_description (target->beneath); } static char * diff --git a/gdb/remote.c b/gdb/remote.c index 2f079ca117a..537221aa436 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -9434,7 +9434,7 @@ remote_read_description (struct target_ops *target) /* Do not try this during initial connection, when we do not know whether there is a running but stopped thread. */ if (!target_has_execution || ptid_equal (inferior_ptid, null_ptid)) - return NULL; + return target->beneath->to_read_description (target->beneath); if (!VEC_empty (remote_g_packet_guess_s, data->guesses)) { @@ -9453,7 +9453,7 @@ remote_read_description (struct target_ops *target) an architecture, but it's too tricky to do safely. */ } - return NULL; + return target->beneath->to_read_description (target->beneath); } /* Remote file transfer support. This is host-initiated I/O, not diff --git a/gdb/target-delegates.c b/gdb/target-delegates.c index 0ffee5a8b2e..4585d2592b8 100644 --- a/gdb/target-delegates.c +++ b/gdb/target-delegates.c @@ -801,6 +801,19 @@ tdefault_flash_done (struct target_ops *self) tcomplain (); } +static const struct target_desc * +delegate_read_description (struct target_ops *self) +{ + self = self->beneath; + return self->to_read_description (self); +} + +static const struct target_desc * +tdefault_read_description (struct target_ops *self) +{ + return 0; +} + static ptid_t delegate_get_ada_task_ptid (struct target_ops *self, long arg1, long arg2) { @@ -1700,6 +1713,8 @@ install_delegators (struct target_ops *ops) ops->to_flash_erase = delegate_flash_erase; if (ops->to_flash_done == NULL) ops->to_flash_done = delegate_flash_done; + if (ops->to_read_description == NULL) + ops->to_read_description = delegate_read_description; if (ops->to_get_ada_task_ptid == NULL) ops->to_get_ada_task_ptid = delegate_get_ada_task_ptid; if (ops->to_auxv_parse == NULL) @@ -1896,6 +1911,7 @@ install_dummy_methods (struct target_ops *ops) ops->to_memory_map = tdefault_memory_map; ops->to_flash_erase = tdefault_flash_erase; ops->to_flash_done = tdefault_flash_done; + ops->to_read_description = tdefault_read_description; ops->to_get_ada_task_ptid = default_get_ada_task_ptid; ops->to_auxv_parse = default_auxv_parse; ops->to_search_memory = default_search_memory; diff --git a/gdb/target.c b/gdb/target.c index 13b2e652925..44387da3d68 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -748,7 +748,6 @@ update_current_target (void) (int (*) (CORE_ADDR, gdb_byte *, int, int, struct mem_attrib *, struct target_ops *)) nomemory); - current_target.to_read_description = NULL; #undef de_fault @@ -2630,19 +2629,7 @@ target_mourn_inferior (void) const struct target_desc * target_read_description (struct target_ops *target) { - struct target_ops *t; - - for (t = target; t != NULL; t = t->beneath) - if (t->to_read_description != NULL) - { - const struct target_desc *tdesc; - - tdesc = t->to_read_description (t); - if (tdesc) - return tdesc; - } - - return NULL; + return target->to_read_description (target); } /* This implements a basic search of memory, reading target memory and diff --git a/gdb/target.h b/gdb/target.h index ec15e5b0d4a..34539c16ca5 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -690,10 +690,12 @@ struct target_ops void (*to_flash_done) (struct target_ops *) TARGET_DEFAULT_NORETURN (tcomplain ()); - /* Describe the architecture-specific features of this target. - Returns the description found, or NULL if no description - was available. */ - const struct target_desc *(*to_read_description) (struct target_ops *ops); + /* Describe the architecture-specific features of this target. If + OPS doesn't have a description, this should delegate to the + "beneath" target. Returns the description found, or NULL if no + description was available. */ + const struct target_desc *(*to_read_description) (struct target_ops *ops) + TARGET_DEFAULT_RETURN (0); /* Build the PTID of the thread on which a given task is running, based on LWP and THREAD. These values are extracted from the -- 2.39.2