mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-08-02 19:46:09 +08:00
Commonise tdesc types and makes use of them in gdbserver tdesc
gdb/ * common/tdesc.c (tdesc_predefined_type): Move to here. (tdesc_named_type): Likewise. (tdesc_create_vector): Likewise. (tdesc_create_struct): Likewise. (tdesc_set_struct_size): Likewise. (tdesc_create_union): Likewise. (tdesc_create_flags): Likewise. (tdesc_create_enum): Likewise. (tdesc_add_field): Likewise. (tdesc_add_typed_bitfield): Likewise. (tdesc_add_bitfield): Likewise. (tdesc_add_flag): Likewise. (tdesc_add_enum_value): Likewise. * common/tdesc.h (struct tdesc_type_builtin): Likewise. (struct tdesc_type_vector): Likewise. (struct tdesc_type_field): Likewise. (struct tdesc_type_with_fields): Likewise. (tdesc_create_enum): Add declaration. (tdesc_add_typed_bitfield): Likewise. (tdesc_add_enum_value): Likewise. * target-descriptions.c (tdesc_type_field): Move from here. (tdesc_type_builtin): Likewise. (tdesc_type_vector): Likewise. (tdesc_type_with_fields): Likewise. (tdesc_predefined_types): Likewise. (tdesc_named_type): Likewise. (tdesc_create_vector): Likewise. (tdesc_create_struct): Likewise. (tdesc_set_struct_size): Likewise. (tdesc_create_union): Likewise. (tdesc_create_flags): Likewise. (tdesc_create_enum): Likewise. (tdesc_add_field): Likewise. (tdesc_add_typed_bitfield): Likewise. (tdesc_add_bitfield): Likewise. (tdesc_add_flag): Likewise. (tdesc_add_enum_value): Likewise. * gdb/target-descriptions.h (tdesc_create_enum): Likewise. (tdesc_add_typed_bitfield): Likewise. (tdesc_add_enum_value): Likewise. gdbserver/ * tdesc.c (tdesc_create_flags): Remove. (tdesc_add_flag): Likewise. (tdesc_named_type): Likewise. (tdesc_create_union): Likewise. (tdesc_create_struct): Likewise. (tdesc_create_vector): Likewise. (tdesc_add_bitfield): Likewise. (tdesc_add_field): Likewise. (tdesc_set_struct_size): Likewise.
This commit is contained in:
Alan Hayward
@ -50,71 +50,6 @@ struct property
|
||||
std::string value;
|
||||
};
|
||||
|
||||
/* A named type from a target description. */
|
||||
|
||||
struct tdesc_type_field
|
||||
{
|
||||
tdesc_type_field (const std::string &name_, tdesc_type *type_,
|
||||
int start_, int end_)
|
||||
: name (name_), type (type_), start (start_), end (end_)
|
||||
{}
|
||||
|
||||
std::string name;
|
||||
struct tdesc_type *type;
|
||||
/* For non-enum-values, either both are -1 (non-bitfield), or both are
|
||||
not -1 (bitfield). For enum values, start is the value (which could be
|
||||
-1), end is -1. */
|
||||
int start, end;
|
||||
};
|
||||
|
||||
struct tdesc_type_builtin : tdesc_type
|
||||
{
|
||||
tdesc_type_builtin (const std::string &name, enum tdesc_type_kind kind)
|
||||
: tdesc_type (name, kind)
|
||||
{}
|
||||
|
||||
void accept (tdesc_element_visitor &v) const override
|
||||
{
|
||||
v.visit (this);
|
||||
}
|
||||
};
|
||||
|
||||
/* tdesc_type for vector types. */
|
||||
|
||||
struct tdesc_type_vector : tdesc_type
|
||||
{
|
||||
tdesc_type_vector (const std::string &name, tdesc_type *element_type_, int count_)
|
||||
: tdesc_type (name, TDESC_TYPE_VECTOR),
|
||||
element_type (element_type_), count (count_)
|
||||
{}
|
||||
|
||||
void accept (tdesc_element_visitor &v) const override
|
||||
{
|
||||
v.visit (this);
|
||||
}
|
||||
|
||||
struct tdesc_type *element_type;
|
||||
int count;
|
||||
};
|
||||
|
||||
/* tdesc_type for struct, union, flags, and enum types. */
|
||||
|
||||
struct tdesc_type_with_fields : tdesc_type
|
||||
{
|
||||
tdesc_type_with_fields (const std::string &name, tdesc_type_kind kind,
|
||||
int size_ = 0)
|
||||
: tdesc_type (name, kind), size (size_)
|
||||
{}
|
||||
|
||||
void accept (tdesc_element_visitor &v) const override
|
||||
{
|
||||
v.visit (this);
|
||||
}
|
||||
|
||||
std::vector<tdesc_type_field> fields;
|
||||
int size;
|
||||
};
|
||||
|
||||
/* Convert a tdesc_type to a gdb type. */
|
||||
|
||||
static type *
|
||||
@ -741,58 +676,6 @@ tdesc_feature_name (const struct tdesc_feature *feature)
|
||||
return feature->name.c_str ();
|
||||
}
|
||||
|
||||
/* Predefined types. */
|
||||
static tdesc_type_builtin tdesc_predefined_types[] =
|
||||
{
|
||||
{ "bool", TDESC_TYPE_BOOL },
|
||||
{ "int8", TDESC_TYPE_INT8 },
|
||||
{ "int16", TDESC_TYPE_INT16 },
|
||||
{ "int32", TDESC_TYPE_INT32 },
|
||||
{ "int64", TDESC_TYPE_INT64 },
|
||||
{ "int128", TDESC_TYPE_INT128 },
|
||||
{ "uint8", TDESC_TYPE_UINT8 },
|
||||
{ "uint16", TDESC_TYPE_UINT16 },
|
||||
{ "uint32", TDESC_TYPE_UINT32 },
|
||||
{ "uint64", TDESC_TYPE_UINT64 },
|
||||
{ "uint128", TDESC_TYPE_UINT128 },
|
||||
{ "code_ptr", TDESC_TYPE_CODE_PTR },
|
||||
{ "data_ptr", TDESC_TYPE_DATA_PTR },
|
||||
{ "ieee_single", TDESC_TYPE_IEEE_SINGLE },
|
||||
{ "ieee_double", TDESC_TYPE_IEEE_DOUBLE },
|
||||
{ "arm_fpa_ext", TDESC_TYPE_ARM_FPA_EXT },
|
||||
{ "i387_ext", TDESC_TYPE_I387_EXT }
|
||||
};
|
||||
|
||||
/* Lookup a predefined type. */
|
||||
|
||||
static struct tdesc_type *
|
||||
tdesc_predefined_type (enum tdesc_type_kind kind)
|
||||
{
|
||||
for (int ix = 0; ix < ARRAY_SIZE (tdesc_predefined_types); ix++)
|
||||
if (tdesc_predefined_types[ix].kind == kind)
|
||||
return &tdesc_predefined_types[ix];
|
||||
|
||||
gdb_assert_not_reached ("bad predefined tdesc type");
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
struct tdesc_type *
|
||||
tdesc_named_type (const struct tdesc_feature *feature, const char *id)
|
||||
{
|
||||
/* First try target-defined types. */
|
||||
for (const tdesc_type_up &type : feature->types)
|
||||
if (type->name == id)
|
||||
return type.get ();
|
||||
|
||||
/* Next try the predefined types. */
|
||||
for (int ix = 0; ix < ARRAY_SIZE (tdesc_predefined_types); ix++)
|
||||
if (tdesc_predefined_types[ix].name == id)
|
||||
return &tdesc_predefined_types[ix];
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Lookup type associated with ID. */
|
||||
|
||||
struct type *
|
||||
@ -1227,147 +1110,6 @@ tdesc_use_registers (struct gdbarch *gdbarch,
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
struct tdesc_type *
|
||||
tdesc_create_vector (struct tdesc_feature *feature, const char *name,
|
||||
struct tdesc_type *field_type, int count)
|
||||
{
|
||||
tdesc_type_vector *type = new tdesc_type_vector (name, field_type, count);
|
||||
feature->types.emplace_back (type);
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
tdesc_type_with_fields *
|
||||
tdesc_create_struct (struct tdesc_feature *feature, const char *name)
|
||||
{
|
||||
tdesc_type_with_fields *type
|
||||
= new tdesc_type_with_fields (name, TDESC_TYPE_STRUCT);
|
||||
feature->types.emplace_back (type);
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_set_struct_size (tdesc_type_with_fields *type, int size)
|
||||
{
|
||||
gdb_assert (type->kind == TDESC_TYPE_STRUCT);
|
||||
gdb_assert (size > 0);
|
||||
type->size = size;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
tdesc_type_with_fields *
|
||||
tdesc_create_union (struct tdesc_feature *feature, const char *name)
|
||||
{
|
||||
tdesc_type_with_fields *type
|
||||
= new tdesc_type_with_fields (name, TDESC_TYPE_UNION);
|
||||
feature->types.emplace_back (type);
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
tdesc_type_with_fields *
|
||||
tdesc_create_flags (struct tdesc_feature *feature, const char *name,
|
||||
int size)
|
||||
{
|
||||
gdb_assert (size > 0);
|
||||
|
||||
tdesc_type_with_fields *type
|
||||
= new tdesc_type_with_fields (name, TDESC_TYPE_FLAGS, size);
|
||||
feature->types.emplace_back (type);
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
tdesc_type_with_fields *
|
||||
tdesc_create_enum (struct tdesc_feature *feature, const char *name,
|
||||
int size)
|
||||
{
|
||||
gdb_assert (size > 0);
|
||||
|
||||
tdesc_type_with_fields *type
|
||||
= new tdesc_type_with_fields (name, TDESC_TYPE_ENUM, size);
|
||||
feature->types.emplace_back (type);
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_add_field (tdesc_type_with_fields *type, const char *field_name,
|
||||
struct tdesc_type *field_type)
|
||||
{
|
||||
gdb_assert (type->kind == TDESC_TYPE_UNION
|
||||
|| type->kind == TDESC_TYPE_STRUCT);
|
||||
|
||||
/* Initialize start and end so we know this is not a bit-field
|
||||
when we print-c-tdesc. */
|
||||
type->fields.emplace_back (field_name, field_type, -1, -1);
|
||||
}
|
||||
|
||||
void
|
||||
tdesc_add_typed_bitfield (tdesc_type_with_fields *type, const char *field_name,
|
||||
int start, int end, struct tdesc_type *field_type)
|
||||
{
|
||||
gdb_assert (type->kind == TDESC_TYPE_STRUCT
|
||||
|| type->kind == TDESC_TYPE_FLAGS);
|
||||
gdb_assert (start >= 0 && end >= start);
|
||||
|
||||
type->fields.emplace_back (field_name, field_type, start, end);
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name,
|
||||
int start, int end)
|
||||
{
|
||||
struct tdesc_type *field_type;
|
||||
|
||||
gdb_assert (start >= 0 && end >= start);
|
||||
|
||||
if (type->size > 4)
|
||||
field_type = tdesc_predefined_type (TDESC_TYPE_UINT64);
|
||||
else
|
||||
field_type = tdesc_predefined_type (TDESC_TYPE_UINT32);
|
||||
|
||||
tdesc_add_typed_bitfield (type, field_name, start, end, field_type);
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_add_flag (tdesc_type_with_fields *type, int start,
|
||||
const char *flag_name)
|
||||
{
|
||||
gdb_assert (type->kind == TDESC_TYPE_FLAGS
|
||||
|| type->kind == TDESC_TYPE_STRUCT);
|
||||
|
||||
type->fields.emplace_back (flag_name,
|
||||
tdesc_predefined_type (TDESC_TYPE_BOOL),
|
||||
start, start);
|
||||
}
|
||||
|
||||
void
|
||||
tdesc_add_enum_value (tdesc_type_with_fields *type, int value,
|
||||
const char *name)
|
||||
{
|
||||
gdb_assert (type->kind == TDESC_TYPE_ENUM);
|
||||
type->fields.emplace_back (name,
|
||||
tdesc_predefined_type (TDESC_TYPE_INT32),
|
||||
value, -1);
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
struct tdesc_feature *
|
||||
tdesc_create_feature (struct target_desc *tdesc, const char *name,
|
||||
const char *xml)
|
||||
|
||||
Reference in New Issue
Block a user