Patchwork [v5,4/8] Add tdesc osabi and architecture functions

login
register
mail settings
Submitter Alan Hayward
Date April 10, 2018, 2:33 p.m.
Message ID <20180410143337.71768-5-alan.hayward@arm.com>
Download mbox | patch
Permalink /patch/26670/
State New
Headers show

Comments

Alan Hayward - April 10, 2018, 2:33 p.m.
Add functions to access to printable names for osabi and architecture in
target_desc.

I wanted to add these as member functions of target_desc, but cannot until
target_desc is moved into the header files.

Identical to V3/4 versions.

Alan.

2018-04-10  Alan Hayward  <alan.hayward@arm.com>

gdb/
	* common/tdesc.h (tdesc_architecture_name): Add new declaration.
	(tdesc_osabi_name): Likewise.
	* target-descriptions.c (tdesc_architecture_name): Add new function.
	(tdesc_osabi_name): Likewise.

gdb/gdbserver/
	* tdesc.c (tdesc_architecture_name): Add new function.
	(tdesc_osabi_name): Likewise.
	(tdesc_get_features_xml): Use new functions.
---
 gdb/common/tdesc.h        |  9 +++++++++
 gdb/gdbserver/tdesc.c     | 23 ++++++++++++++++++++---
 gdb/target-descriptions.c | 19 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 4 deletions(-)
Simon Marchi - April 18, 2018, 2:10 a.m.
Hi Alan,

Just a nit:

On 2018-04-10 10:33 AM, Alan Hayward wrote:
> diff --git a/gdb/common/tdesc.h b/gdb/common/tdesc.h
> index 7f4222b653..311341da0d 100644
> --- a/gdb/common/tdesc.h
> +++ b/gdb/common/tdesc.h
> @@ -297,9 +297,18 @@ target_desc *allocate_target_description (void);
>  void set_tdesc_architecture (target_desc *target_desc,
>  			     const char *name);
>  
> +/* Return the architecture associated with this target description as a string,
> +   or NULL if no architecture was specified.  */
> +const char *tdesc_architecture_name (const struct target_desc *target_desc);
> +
>  /* Set TARGET_DESC's osabi by NAME.  */
>  void set_tdesc_osabi (target_desc *target_desc, const char *name);
>  
> +/* Return the osabi associated with this target description as a string,
> +   or NULL if no osabi was specified.  */
> +const char *
> +tdesc_osabi_name (const struct target_desc *target_desc);

Remove the \n before the function name.

Simon

Patch

diff --git a/gdb/common/tdesc.h b/gdb/common/tdesc.h
index 7f4222b653..311341da0d 100644
--- a/gdb/common/tdesc.h
+++ b/gdb/common/tdesc.h
@@ -297,9 +297,18 @@  target_desc *allocate_target_description (void);
 void set_tdesc_architecture (target_desc *target_desc,
 			     const char *name);
 
+/* Return the architecture associated with this target description as a string,
+   or NULL if no architecture was specified.  */
+const char *tdesc_architecture_name (const struct target_desc *target_desc);
+
 /* Set TARGET_DESC's osabi by NAME.  */
 void set_tdesc_osabi (target_desc *target_desc, const char *name);
 
+/* Return the osabi associated with this target description as a string,
+   or NULL if no osabi was specified.  */
+const char *
+tdesc_osabi_name (const struct target_desc *target_desc);
+
 /* Return the type associated with ID in the context of FEATURE, or
    NULL if none.  */
 struct tdesc_type *tdesc_named_type (const struct tdesc_feature *feature,
diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c
index aca27ea3b0..7603a90a59 100644
--- a/gdb/gdbserver/tdesc.c
+++ b/gdb/gdbserver/tdesc.c
@@ -107,6 +107,14 @@  current_target_desc (void)
 
 /* See common/tdesc.h.  */
 
+const char *
+tdesc_architecture_name (const struct target_desc *target_desc)
+{
+  return target_desc->arch;
+}
+
+/* See common/tdesc.h.  */
+
 void
 set_tdesc_architecture (struct target_desc *target_desc,
 			const char *name)
@@ -116,6 +124,14 @@  set_tdesc_architecture (struct target_desc *target_desc,
 
 /* See common/tdesc.h.  */
 
+const char *
+tdesc_osabi_name (const struct target_desc *target_desc)
+{
+  return target_desc->osabi;
+}
+
+/* See common/tdesc.h.  */
+
 void
 set_tdesc_osabi (struct target_desc *target_desc, const char *name)
 {
@@ -140,13 +156,14 @@  tdesc_get_features_xml (target_desc *tdesc)
       buffer += "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">";
       buffer += "<target>";
       buffer += "<architecture>";
-      buffer += tdesc->arch;
+      buffer += tdesc_architecture_name (tdesc);
       buffer += "</architecture>";
 
-      if (tdesc->osabi != nullptr)
+      const char *osabi = tdesc_osabi_name (tdesc);
+      if (osabi != nullptr)
 	{
 	  buffer += "<osabi>";
-	  buffer += tdesc->osabi;
+	  buffer += osabi;
 	  buffer += "</osabi>";
 	}
 
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 2782ffaab9..da2c1ce345 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -628,6 +628,14 @@  tdesc_architecture (const struct target_desc *target_desc)
   return target_desc->arch;
 }
 
+/* See common/tdesc.h.  */
+
+const char *
+tdesc_architecture_name (const struct target_desc *target_desc)
+{
+  return target_desc->arch->printable_name;
+}
+
 /* Return the OSABI associated with this target description, or
    GDB_OSABI_UNKNOWN if no osabi was specified.  */
 
@@ -637,7 +645,16 @@  tdesc_osabi (const struct target_desc *target_desc)
   return target_desc->osabi;
 }
 
-
+/* See common/tdesc.h.  */
+
+const char *
+tdesc_osabi_name (const struct target_desc *target_desc)
+{
+  enum gdb_osabi osabi = tdesc_osabi (target_desc);
+  if (osabi > GDB_OSABI_UNKNOWN && osabi < GDB_OSABI_INVALID)
+    return gdbarch_osabi_name (osabi);
+  return nullptr;
+}
 
 /* Return 1 if this target description includes any registers.  */