diff mbox

Use visitors for make_gdb_type

Message ID a06ab31b-0144-82fe-5d29-4e81016990d3@arm.com
State New
Headers show

Commit Message

Alan Hayward Jan. 26, 2018, 3:12 p.m. UTC
This patch implements the suggestion in the review for
[PATCH v2 6/8] Create xml from target descriptions.

Remove the make_gdb_type functions from the tdesc_type_ classes.
Replace with a static make_gdb_type function that uses a element
visitor called gdb_type_creator.

I've defined gdb_type_creator inside make_gdb_type because it shouldn't
be needed outside the function.

The method of creating the types has not changed.

This patch will allow a future patch to commonise the tdesc_types with
gdbserver without having to move any gdb_type functionality.

Alan.

2018-01-26  Alan Hayward  <alan.hayward@arm.com>

     * target-descriptions.c (tdesc_type): Move make_gdb_type from here.
     (tdesc_type_builtin): Likewise.
     (tdesc_type_vector): Likewise.
     (tdesc_type_with_fields): Move make_gdb_type_ functions from here.
     (make_gdb_type_struct): Move from tdesc_type_with_fields.
     (make_gdb_type_union): Likewise.
     (make_gdb_type_flags): Likewise.
     (make_gdb_type_enum): Likewise.
     (make_gdb_type): New function.
     (tdesc_register_type): Use static make_gdb_type.

---
  gdb/target-descriptions.c | 460 
+++++++++++++++++++++++++---------------------
  1 file changed, 254 insertions(+), 206 deletions(-)

  class tdesc_element_visitor
@@ -223,11 +225,6 @@ struct tdesc_type : tdesc_element
    {
      return !(*this == other);
    }
-
-  /* Construct, if necessary, and return the GDB type implementing this
-     target type for architecture GDBARCH.  */
-
-  virtual type *make_gdb_type (struct gdbarch *gdbarch) const = 0;
  };

  typedef std::unique_ptr<tdesc_type> tdesc_type_up;
@@ -242,81 +239,6 @@ struct tdesc_type_builtin : tdesc_type
    {
      v.visit (this);
    }
-
-  type *make_gdb_type (struct gdbarch *gdbarch) const override
-  {
-    switch (this->kind)
-      {
-      /* Predefined types.  */
-      case TDESC_TYPE_BOOL:
-        return builtin_type (gdbarch)->builtin_bool;
-
-      case TDESC_TYPE_INT8:
-        return builtin_type (gdbarch)->builtin_int8;
-
-      case TDESC_TYPE_INT16:
-        return builtin_type (gdbarch)->builtin_int16;
-
-      case TDESC_TYPE_INT32:
-        return builtin_type (gdbarch)->builtin_int32;
-
-      case TDESC_TYPE_INT64:
-        return builtin_type (gdbarch)->builtin_int64;
-
-      case TDESC_TYPE_INT128:
-        return builtin_type (gdbarch)->builtin_int128;
-
-      case TDESC_TYPE_UINT8:
-        return builtin_type (gdbarch)->builtin_uint8;
-
-      case TDESC_TYPE_UINT16:
-        return builtin_type (gdbarch)->builtin_uint16;
-
-      case TDESC_TYPE_UINT32:
-        return builtin_type (gdbarch)->builtin_uint32;
-
-      case TDESC_TYPE_UINT64:
-        return builtin_type (gdbarch)->builtin_uint64;
-
-      case TDESC_TYPE_UINT128:
-        return builtin_type (gdbarch)->builtin_uint128;
-
-      case TDESC_TYPE_CODE_PTR:
-        return builtin_type (gdbarch)->builtin_func_ptr;
-
-      case TDESC_TYPE_DATA_PTR:
-        return builtin_type (gdbarch)->builtin_data_ptr;
-      }
-
-    type *gdb_type = tdesc_find_type (gdbarch, this->name.c_str ());
-    if (gdb_type != NULL)
-      return gdb_type;
-
-    switch (this->kind)
-      {
-      case TDESC_TYPE_IEEE_SINGLE:
-        return arch_float_type (gdbarch, -1, "builtin_type_ieee_single",
-                floatformats_ieee_single);
-
-      case TDESC_TYPE_IEEE_DOUBLE:
-        return arch_float_type (gdbarch, -1, "builtin_type_ieee_double",
-                floatformats_ieee_double);
-
-      case TDESC_TYPE_ARM_FPA_EXT:
-        return arch_float_type (gdbarch, -1, "builtin_type_arm_ext",
-                floatformats_arm_ext);
-
-      case TDESC_TYPE_I387_EXT:
-        return arch_float_type (gdbarch, -1, "builtin_type_i387_ext",
-                floatformats_i387_ext);
-      }
-
-    internal_error (__FILE__, __LINE__,
-            "Type \"%s\" has an unknown kind %d",
-            this->name.c_str (), this->kind);
-
-    return NULL;
-  }
  };

  /* tdesc_type for vector types.  */
@@ -333,19 +255,6 @@ struct tdesc_type_vector : tdesc_type
      v.visit (this);
    }

-  type *make_gdb_type (struct gdbarch *gdbarch) const override
-  {
-    type *vector_gdb_type = tdesc_find_type (gdbarch, this->name.c_str ());
-    if (vector_gdb_type != NULL)
-      return vector_gdb_type;
-
-    type *element_gdb_type = this->element_type->make_gdb_type (gdbarch);
-    vector_gdb_type = init_vector_type (element_gdb_type, this->count);
-    TYPE_NAME (vector_gdb_type) = xstrdup (this->name.c_str ());
-
-    return vector_gdb_type;
-  }
-
    struct tdesc_type *element_type;
    int count;
  };
@@ -364,151 +273,290 @@ struct tdesc_type_with_fields : tdesc_type
      v.visit (this);
    }

-  type *make_gdb_type_struct (struct gdbarch *gdbarch) const
-  {
-    type *struct_gdb_type = arch_composite_type (gdbarch, NULL, 
TYPE_CODE_STRUCT);
-    TYPE_NAME (struct_gdb_type) = xstrdup (this->name.c_str ());
-    TYPE_TAG_NAME (struct_gdb_type) = TYPE_NAME (struct_gdb_type);
+  std::vector<tdesc_type_field> fields;
+  int size;
+};

-    for (const tdesc_type_field &f : this->fields)
-      {
-    if (f.start != -1 && f.end != -1)
-      {
-        /* Bitfield.  */
-        struct field *fld;
-        struct type *field_gdb_type;
-        int bitsize, total_size;
-
-        /* This invariant should be preserved while creating types.  */
-        gdb_assert (this->size != 0);
-        if (f.type != NULL)
-          field_gdb_type = f.type->make_gdb_type (gdbarch);
-        else if (this->size > 4)
-          field_gdb_type = builtin_type (gdbarch)->builtin_uint64;
-        else
-          field_gdb_type = builtin_type (gdbarch)->builtin_uint32;
-
-        fld = append_composite_type_field_raw
-          (struct_gdb_type, xstrdup (f.name.c_str ()), field_gdb_type);
-
-        /* For little-endian, BITPOS counts from the LSB of
-           the structure and marks the LSB of the field.  For
-           big-endian, BITPOS counts from the MSB of the
-           structure and marks the MSB of the field.  Either
-           way, it is the number of bits to the "left" of the
-           field.  To calculate this in big-endian, we need
-           the total size of the structure.  */
-        bitsize = f.end - f.start + 1;
-        total_size = this->size * TARGET_CHAR_BIT;
-        if (gdbarch_bits_big_endian (gdbarch))
-          SET_FIELD_BITPOS (fld[0], total_size - f.start - bitsize);
-        else
-          SET_FIELD_BITPOS (fld[0], f.start);
-        FIELD_BITSIZE (fld[0]) = bitsize;
-      }
-    else
-      {
-        gdb_assert (f.start == -1 && f.end == -1);
-        type *field_gdb_type = f.type->make_gdb_type (gdbarch);
-        append_composite_type_field (struct_gdb_type,
-                     xstrdup (f.name.c_str ()),
-                     field_gdb_type);
-      }
-      }
+static type *
+make_gdb_type_struct (struct gdbarch *gdbarch, const 
tdesc_type_with_fields *e)
+{
+  type *struct_gdb_type = arch_composite_type (gdbarch, NULL, 
TYPE_CODE_STRUCT);
+  TYPE_NAME (struct_gdb_type) = xstrdup (e->name.c_str ());
+  TYPE_TAG_NAME (struct_gdb_type) = TYPE_NAME (struct_gdb_type);

-    if (this->size != 0)
-      TYPE_LENGTH (struct_gdb_type) = this->size;
+  for (const tdesc_type_field &f : e->fields)
+    {
+      if (f.start != -1 && f.end != -1)
+    {
+      /* Bitfield.  */
+      struct field *fld;
+      struct type *field_gdb_type;
+      int bitsize, total_size;
+
+      /* This invariant should be preserved while creating types.  */
+      gdb_assert (e->size != 0);
+      if (f.type != NULL)
+        field_gdb_type = make_gdb_type (gdbarch, f.type);
+      else if (e->size > 4)
+        field_gdb_type = builtin_type (gdbarch)->builtin_uint64;
+      else
+        field_gdb_type = builtin_type (gdbarch)->builtin_uint32;
+
+      fld = append_composite_type_field_raw
+        (struct_gdb_type, xstrdup (f.name.c_str ()), field_gdb_type);
+
+      /* For little-endian, BITPOS counts from the LSB of
+         the structure and marks the LSB of the field.  For
+         big-endian, BITPOS counts from the MSB of the
+         structure and marks the MSB of the field.  Either
+         way, it is the number of bits to the "left" of the
+         field.  To calculate this in big-endian, we need
+         the total size of the structure.  */
+      bitsize = f.end - f.start + 1;
+      total_size = e->size * TARGET_CHAR_BIT;
+      if (gdbarch_bits_big_endian (gdbarch))
+        SET_FIELD_BITPOS (fld[0], total_size - f.start - bitsize);
+      else
+        SET_FIELD_BITPOS (fld[0], f.start);
+      FIELD_BITSIZE (fld[0]) = bitsize;
+    }
+      else
+    {
+      gdb_assert (f.start == -1 && f.end == -1);
+      type *field_gdb_type = make_gdb_type (gdbarch, f.type);
+      append_composite_type_field (struct_gdb_type,
+                       xstrdup (f.name.c_str ()),
+                       field_gdb_type);
+    }
+    }

-    return struct_gdb_type;
-  }
+  if (e->size != 0)
+    TYPE_LENGTH (struct_gdb_type) = e->size;

-  type *make_gdb_type_union (struct gdbarch *gdbarch) const
-  {
-    type *union_gdb_type = arch_composite_type (gdbarch, NULL, 
TYPE_CODE_UNION);
-    TYPE_NAME (union_gdb_type) = xstrdup (this->name.c_str ());
+  return struct_gdb_type;
+}

-    for (const tdesc_type_field &f : this->fields)
-      {
-    type* field_gdb_type = f.type->make_gdb_type (gdbarch);
-    append_composite_type_field (union_gdb_type, xstrdup (f.name.c_str ()),
+static type *
+make_gdb_type_union (struct gdbarch *gdbarch, const 
tdesc_type_with_fields *e)
+{
+  type *union_gdb_type = arch_composite_type (gdbarch, NULL, 
TYPE_CODE_UNION);
+  TYPE_NAME (union_gdb_type) = xstrdup (e->name.c_str ());
+
+  for (const tdesc_type_field &f : e->fields)
+    {
+      type* field_gdb_type = make_gdb_type (gdbarch, f.type);
+      append_composite_type_field (union_gdb_type, xstrdup 
(f.name.c_str ()),
                       field_gdb_type);

-    /* If any of the children of a union are vectors, flag the
-       union as a vector also.  This allows e.g. a union of two
-       vector types to show up automatically in "info vector". */
-    if (TYPE_VECTOR (field_gdb_type))
-      TYPE_VECTOR (union_gdb_type) = 1;
-      }
+      /* If any of the children of a union are vectors, flag the
+     union as a vector also.  This allows e.g. a union of two
+     vector types to show up automatically in "info vector".  */
+      if (TYPE_VECTOR (field_gdb_type))
+    TYPE_VECTOR (union_gdb_type) = 1;
+    }

-    return union_gdb_type;
-  }
+  return union_gdb_type;
+}

-  type *make_gdb_type_flags (struct gdbarch *gdbarch) const
-  {
-    type *flags_gdb_type = arch_flags_type (gdbarch, this->name.c_str (),
-                      this->size * TARGET_CHAR_BIT);
+static type *
+make_gdb_type_flags (struct gdbarch *gdbarch, const 
tdesc_type_with_fields *e)
+{
+  type *flags_gdb_type = arch_flags_type (gdbarch, e->name.c_str (),
+                      e->size * TARGET_CHAR_BIT);

-    for (const tdesc_type_field &f : this->fields)
-      {
+  for (const tdesc_type_field &f : e->fields)
+    {
        int bitsize = f.end - f.start + 1;

        gdb_assert (f.type != NULL);
-      type *field_gdb_type = f.type->make_gdb_type (gdbarch);
+      type *field_gdb_type = make_gdb_type (gdbarch, f.type);
        append_flags_type_field (flags_gdb_type, f.start, bitsize,
                     field_gdb_type, f.name.c_str ());
-      }
+    }

-    return flags_gdb_type;
-  }
+  return flags_gdb_type;
+}

-  type *make_gdb_type_enum (struct gdbarch *gdbarch) const
-  {
-    type *enum_gdb_type = arch_type (gdbarch, TYPE_CODE_ENUM,
-                   this->size * TARGET_CHAR_BIT,
-                   this->name.c_str ());
+static type *
+make_gdb_type_enum (struct gdbarch *gdbarch, const 
tdesc_type_with_fields *e)
+{
+  type *enum_gdb_type = arch_type (gdbarch, TYPE_CODE_ENUM,
+                   e->size * TARGET_CHAR_BIT,
+                   e->name.c_str ());

-    TYPE_UNSIGNED (enum_gdb_type) = 1;
-    for (const tdesc_type_field &f : this->fields)
-      {
+  TYPE_UNSIGNED (enum_gdb_type) = 1;
+  for (const tdesc_type_field &f : e->fields)
+    {
        struct field *fld
      = append_composite_type_field_raw (enum_gdb_type,
                         xstrdup (f.name.c_str ()),
                         NULL);

        SET_FIELD_BITPOS (fld[0], f.start);
-      }
+    }

-    return enum_gdb_type;
-  }
+  return enum_gdb_type;
+}

-  type *make_gdb_type (struct gdbarch *gdbarch) const override
+static type *
+make_gdb_type (struct gdbarch *gdbarch, struct tdesc_type *ttype)
+{
+  class gdb_type_creator : public tdesc_element_visitor
    {
-    type *gdb_type = tdesc_find_type (gdbarch, this->name.c_str ());
-    if (gdb_type != NULL)
-      return gdb_type;
+  public:
+    gdb_type_creator (struct gdbarch *gdbarch)
+      : m_gdbarch (gdbarch)
+    {}

-    switch (this->kind)
+    type *get_type ()
      {
-      case TDESC_TYPE_STRUCT:
-    return make_gdb_type_struct (gdbarch);
-      case TDESC_TYPE_UNION:
-    return make_gdb_type_union (gdbarch);
-      case TDESC_TYPE_FLAGS:
-    return make_gdb_type_flags (gdbarch);
-      case TDESC_TYPE_ENUM:
-    return make_gdb_type_enum (gdbarch);
+      return m_type;
      }

-    internal_error (__FILE__, __LINE__,
-            "Type \"%s\" has an unknown kind %d",
-            this->name.c_str (), this->kind);
+    void visit_pre (const target_desc *e)
+    {}

-    return NULL;
-  }
+    void visit_post (const target_desc *e)
+    {}

-  std::vector<tdesc_type_field> fields;
-  int size;
-};
+    void visit_pre (const tdesc_feature *e)
+    {}
+
+    void visit_post (const tdesc_feature *e)
+    {}
+
+    void visit (const tdesc_type_builtin *e) override
+    {
+      switch (e->kind)
+    {
+      /* Predefined types.  */
+    case TDESC_TYPE_BOOL:
+      m_type = builtin_type (m_gdbarch)->builtin_bool;
+      return;
+    case TDESC_TYPE_INT8:
+      m_type = builtin_type (m_gdbarch)->builtin_int8;
+      return;
+    case TDESC_TYPE_INT16:
+      m_type = builtin_type (m_gdbarch)->builtin_int16;
+      return;
+    case TDESC_TYPE_INT32:
+      m_type = builtin_type (m_gdbarch)->builtin_int32;
+      return;
+    case TDESC_TYPE_INT64:
+      m_type = builtin_type (m_gdbarch)->builtin_int64;
+      return;
+    case TDESC_TYPE_INT128:
+      m_type = builtin_type (m_gdbarch)->builtin_int128;
+      return;
+    case TDESC_TYPE_UINT8:
+      m_type = builtin_type (m_gdbarch)->builtin_uint8;
+      return;
+    case TDESC_TYPE_UINT16:
+      m_type = builtin_type (m_gdbarch)->builtin_uint16;
+      return;
+    case TDESC_TYPE_UINT32:
+      m_type = builtin_type (m_gdbarch)->builtin_uint32;
+      return;
+    case TDESC_TYPE_UINT64:
+      m_type = builtin_type (m_gdbarch)->builtin_uint64;
+      return;
+    case TDESC_TYPE_UINT128:
+      m_type = builtin_type (m_gdbarch)->builtin_uint128;
+      return;
+    case TDESC_TYPE_CODE_PTR:
+      m_type = builtin_type (m_gdbarch)->builtin_func_ptr;
+      return;
+    case TDESC_TYPE_DATA_PTR:
+      m_type = builtin_type (m_gdbarch)->builtin_data_ptr;
+      return;
+    }
+
+      m_type = tdesc_find_type (m_gdbarch, e->name.c_str ());
+      if (m_type != NULL)
+    return;
+
+      switch (e->kind)
+    {
+    case TDESC_TYPE_IEEE_SINGLE:
+      m_type = arch_float_type (m_gdbarch, -1, "builtin_type_ieee_single",
+                    floatformats_ieee_single);
+      return;
+
+    case TDESC_TYPE_IEEE_DOUBLE:
+      m_type = arch_float_type (m_gdbarch, -1, "builtin_type_ieee_double",
+                    floatformats_ieee_double);
+      return;
+    case TDESC_TYPE_ARM_FPA_EXT:
+      m_type = arch_float_type (m_gdbarch, -1, "builtin_type_arm_ext",
+                    floatformats_arm_ext);
+      return;
+
+    case TDESC_TYPE_I387_EXT:
+      m_type = arch_float_type (m_gdbarch, -1, "builtin_type_i387_ext",
+                    floatformats_i387_ext);
+      return;
+    }
+
+      internal_error (__FILE__, __LINE__,
+              "Type \"%s\" has an unknown kind %d",
+              e->name.c_str (), e->kind);
+    }
+
+    void visit (const tdesc_type_vector *e) override
+    {
+      m_type = tdesc_find_type (m_gdbarch, e->name.c_str ());
+      if (m_type != NULL)
+    return;
+
+      type *element_gdb_type = make_gdb_type (m_gdbarch, e->element_type);
+      m_type = init_vector_type (element_gdb_type, e->count);
+      TYPE_NAME (m_type) = xstrdup (e->name.c_str ());
+      return;
+    }
+
+    void visit (const tdesc_type_with_fields *e) override
+    {
+      m_type = tdesc_find_type (m_gdbarch, e->name.c_str ());
+      if (m_type != NULL)
+    return;
+
+      switch (e->kind)
+    {
+    case TDESC_TYPE_STRUCT:
+      m_type = make_gdb_type_struct (m_gdbarch, e);
+      return;
+    case TDESC_TYPE_UNION:
+      m_type = make_gdb_type_union (m_gdbarch, e);
+      return;
+    case TDESC_TYPE_FLAGS:
+      m_type = make_gdb_type_flags (m_gdbarch, e);
+      return;
+    case TDESC_TYPE_ENUM:
+      m_type = make_gdb_type_enum (m_gdbarch, e);
+      return;
+    }
+
+      internal_error (__FILE__, __LINE__,
+              "Type \"%s\" has an unknown kind %d",
+              e->name.c_str (), e->kind);
+    }
+
+    void visit (const tdesc_reg *reg)
+    {}
+
+  private:
+
+    /* The gdbarch used.  */
+    struct gdbarch *m_gdbarch;
+
+    /* The type created.  */
+    type *m_type;
+  };
+
+  gdb_type_creator gdb_type (gdbarch);
+  ttype->accept (gdb_type);
+  return gdb_type.get_type ();
+}

  /* A feature from a target description.  Each feature is a collection
     of other elements, e.g. registers and types.  */
@@ -1216,7 +1264,7 @@ tdesc_register_type (struct gdbarch *gdbarch, int 
regno)
      {
        /* First check for a predefined or target defined type.  */
        if (reg->tdesc_type)
-        arch_reg->type = reg->tdesc_type->make_gdb_type (gdbarch);
+    arch_reg->type = make_gdb_type (gdbarch, reg->tdesc_type);

        /* Next try size-sensitive type shortcuts.  */
        else if (reg->type == "float")
diff mbox

Patch

diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 1b20a12d76..55ac1d7a80 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -38,6 +38,8 @@ 
  #include "completer.h"
  #include "readline/tilde.h" /* tilde_expand */

+static type *make_gdb_type (struct gdbarch *gdbarch, struct tdesc_type 
*ttype);
+
  /* The interface to visit different elements of target description.  */