[PATCH] Use visitors for make_gdb_type
Alan Hayward
alan.hayward@arm.com
Fri Jan 26 15:14:00 GMT 2018
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(-)
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. */
 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")
--
2.14.3 (Apple Git-98)
More information about the Gdb-patches
mailing list