Commonise tdesc_feature and makes use of it in gdbserver tdesc
gdb/ * common/tdesc.c (tdesc_feature::accept): Move to here. (tdesc_feature::operator==): Likewise. (tdesc_create_reg): Likewise. * common/tdesc.h (tdesc_type_kind): Likewise. (struct tdesc_type): Likewise. (struct tdesc_feature): Likewise. * regformats/regdat.sh: Create a feature. * target-descriptions.c (tdesc_type_kind): Move from here. (tdesc_type): Likewise. (tdesc_type_up): Likewise. (tdesc_feature): Likewise. (tdesc_create_reg): Likewise. gdbserver/ * tdesc.c (~target_desc): Remove implictly deleted items. (init_target_desc): Iterate all features. (tdesc_get_features_xml): Use vector. (tdesc_create_feature): Create feature. * tdesc.h (tdesc_feature) Remove (target_desc): Add features.
This commit is contained in:
Alan Hayward
parent
ea3e7d7179
commit
82ec9bc705
|
|
@ -1,3 +1,18 @@
|
|||
2018-04-18 Alan Hayward <alan.hayward@arm.com>
|
||||
|
||||
* common/tdesc.c (tdesc_feature::accept): Move to here.
|
||||
(tdesc_feature::operator==): Likewise.
|
||||
(tdesc_create_reg): Likewise.
|
||||
* common/tdesc.h (tdesc_type_kind): Likewise.
|
||||
(struct tdesc_type): Likewise.
|
||||
(struct tdesc_feature): Likewise.
|
||||
* regformats/regdat.sh: Create a feature.
|
||||
* target-descriptions.c (tdesc_type_kind): Move from here.
|
||||
(tdesc_type): Likewise.
|
||||
(tdesc_type_up): Likewise.
|
||||
(tdesc_feature): Likewise.
|
||||
(tdesc_create_reg): Likewise.
|
||||
|
||||
2018-04-18 Alan Hayward <alan.hayward@arm.com>
|
||||
|
||||
* Makefile.in: Add arch/tdesc.c
|
||||
|
|
|
|||
|
|
@ -33,3 +33,61 @@ tdesc_reg::tdesc_reg (struct tdesc_feature *feature, const std::string &name_,
|
|||
have easy access to the containing feature when we want it later. */
|
||||
tdesc_type = tdesc_named_type (feature, type.c_str ());
|
||||
}
|
||||
|
||||
void tdesc_feature::accept (tdesc_element_visitor &v) const
|
||||
{
|
||||
v.visit_pre (this);
|
||||
|
||||
for (const tdesc_type_up &type : types)
|
||||
type->accept (v);
|
||||
|
||||
for (const tdesc_reg_up ® : registers)
|
||||
reg->accept (v);
|
||||
|
||||
v.visit_post (this);
|
||||
}
|
||||
|
||||
bool tdesc_feature::operator== (const tdesc_feature &other) const
|
||||
{
|
||||
if (name != other.name)
|
||||
return false;
|
||||
|
||||
if (registers.size () != other.registers.size ())
|
||||
return false;
|
||||
|
||||
for (int ix = 0; ix < registers.size (); ix++)
|
||||
{
|
||||
const tdesc_reg_up ®1 = registers[ix];
|
||||
const tdesc_reg_up ®2 = other.registers[ix];
|
||||
|
||||
if (reg1 != reg2 && *reg1 != *reg2)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (types.size () != other.types.size ())
|
||||
return false;
|
||||
|
||||
for (int ix = 0; ix < types.size (); ix++)
|
||||
{
|
||||
const tdesc_type_up &type1 = types[ix];
|
||||
const tdesc_type_up &type2 = other.types[ix];
|
||||
|
||||
if (type1 != type2 && *type1 != *type2)
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_create_reg (struct tdesc_feature *feature, const char *name,
|
||||
int regnum, int save_restore, const char *group,
|
||||
int bitsize, const char *type)
|
||||
{
|
||||
tdesc_reg *reg = new tdesc_reg (feature, name, regnum, save_restore,
|
||||
group, bitsize, type);
|
||||
|
||||
feature->registers.emplace_back (reg);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,6 +131,99 @@ struct tdesc_reg : tdesc_element
|
|||
|
||||
typedef std::unique_ptr<tdesc_reg> tdesc_reg_up;
|
||||
|
||||
enum tdesc_type_kind
|
||||
{
|
||||
/* Predefined types. */
|
||||
TDESC_TYPE_BOOL,
|
||||
TDESC_TYPE_INT8,
|
||||
TDESC_TYPE_INT16,
|
||||
TDESC_TYPE_INT32,
|
||||
TDESC_TYPE_INT64,
|
||||
TDESC_TYPE_INT128,
|
||||
TDESC_TYPE_UINT8,
|
||||
TDESC_TYPE_UINT16,
|
||||
TDESC_TYPE_UINT32,
|
||||
TDESC_TYPE_UINT64,
|
||||
TDESC_TYPE_UINT128,
|
||||
TDESC_TYPE_CODE_PTR,
|
||||
TDESC_TYPE_DATA_PTR,
|
||||
TDESC_TYPE_IEEE_SINGLE,
|
||||
TDESC_TYPE_IEEE_DOUBLE,
|
||||
TDESC_TYPE_ARM_FPA_EXT,
|
||||
TDESC_TYPE_I387_EXT,
|
||||
|
||||
/* Types defined by a target feature. */
|
||||
TDESC_TYPE_VECTOR,
|
||||
TDESC_TYPE_STRUCT,
|
||||
TDESC_TYPE_UNION,
|
||||
TDESC_TYPE_FLAGS,
|
||||
TDESC_TYPE_ENUM
|
||||
};
|
||||
|
||||
struct tdesc_type : tdesc_element
|
||||
{
|
||||
tdesc_type (const std::string &name_, enum tdesc_type_kind kind_)
|
||||
: name (name_), kind (kind_)
|
||||
{}
|
||||
|
||||
virtual ~tdesc_type () = default;
|
||||
|
||||
DISABLE_COPY_AND_ASSIGN (tdesc_type);
|
||||
|
||||
/* The name of this type. */
|
||||
std::string name;
|
||||
|
||||
/* Identify the kind of this type. */
|
||||
enum tdesc_type_kind kind;
|
||||
|
||||
bool operator== (const tdesc_type &other) const
|
||||
{
|
||||
return name == other.name && kind == other.kind;
|
||||
}
|
||||
|
||||
bool operator!= (const tdesc_type &other) const
|
||||
{
|
||||
return !(*this == other);
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::unique_ptr<tdesc_type> tdesc_type_up;
|
||||
|
||||
/* A feature from a target description. Each feature is a collection
|
||||
of other elements, e.g. registers and types. */
|
||||
|
||||
struct tdesc_feature : tdesc_element
|
||||
{
|
||||
tdesc_feature (const std::string &name_)
|
||||
: name (name_)
|
||||
{}
|
||||
|
||||
virtual ~tdesc_feature () = default;
|
||||
|
||||
DISABLE_COPY_AND_ASSIGN (tdesc_feature);
|
||||
|
||||
/* The name of this feature. It may be recognized by the architecture
|
||||
support code. */
|
||||
std::string name;
|
||||
|
||||
/* The registers associated with this feature. */
|
||||
std::vector<tdesc_reg_up> registers;
|
||||
|
||||
/* The types associated with this feature. */
|
||||
std::vector<tdesc_type_up> types;
|
||||
|
||||
void accept (tdesc_element_visitor &v) const override;
|
||||
|
||||
bool operator== (const tdesc_feature &other) const;
|
||||
|
||||
bool operator!= (const tdesc_feature &other) const
|
||||
{
|
||||
return !(*this == other);
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::unique_ptr<tdesc_feature> tdesc_feature_up;
|
||||
|
||||
/* Allocate a new target_desc. */
|
||||
target_desc *allocate_target_description (void);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
2018-04-18 Alan Hayward <alan.hayward@arm.com>
|
||||
|
||||
* tdesc.c (~target_desc): Remove implictly deleted items.
|
||||
(init_target_desc): Iterate all features.
|
||||
(tdesc_get_features_xml): Use vector.
|
||||
(tdesc_create_feature): Create feature.
|
||||
* tdesc.h (tdesc_feature) Remove
|
||||
(target_desc): Add features.
|
||||
|
||||
2018-04-18 Alan Hayward <alan.hayward@arm.com>
|
||||
|
||||
* Makefile.in: Add common/tdesc.c
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@
|
|||
|
||||
target_desc::~target_desc ()
|
||||
{
|
||||
int i;
|
||||
|
||||
xfree ((char *) arch);
|
||||
xfree ((char *) osabi);
|
||||
}
|
||||
|
|
@ -55,19 +53,21 @@ init_target_desc (struct target_desc *tdesc)
|
|||
int offset = 0;
|
||||
|
||||
/* Go through all the features and populate reg_defs. */
|
||||
for (const tdesc_reg_up &treg : tdesc->registers)
|
||||
{
|
||||
int regnum = treg->target_regnum;
|
||||
for (const tdesc_feature_up &feature : tdesc->features)
|
||||
for (const tdesc_reg_up &treg : feature->registers)
|
||||
{
|
||||
int regnum = treg->target_regnum;
|
||||
|
||||
/* Register number will increase (possibly with gaps) or be zero. */
|
||||
gdb_assert (regnum == 0 || regnum >= tdesc->reg_defs.size ());
|
||||
/* Register number will increase (possibly with gaps) or be zero. */
|
||||
gdb_assert (regnum == 0 || regnum >= tdesc->reg_defs.size ());
|
||||
|
||||
if (regnum != 0)
|
||||
tdesc->reg_defs.resize (regnum, reg (offset));
|
||||
if (regnum != 0)
|
||||
tdesc->reg_defs.resize (regnum, reg (offset));
|
||||
|
||||
tdesc->reg_defs.emplace_back (treg->name.c_str (), offset, treg->bitsize);
|
||||
offset += treg->bitsize;
|
||||
}
|
||||
tdesc->reg_defs.emplace_back (treg->name.c_str (), offset,
|
||||
treg->bitsize);
|
||||
offset += treg->bitsize;
|
||||
}
|
||||
|
||||
tdesc->registers_size = offset / 8;
|
||||
|
||||
|
|
@ -150,11 +150,10 @@ tdesc_get_features_xml (target_desc *tdesc)
|
|||
buffer += "</osabi>";
|
||||
}
|
||||
|
||||
|
||||
for (const std::string &xml : tdesc->features)
|
||||
for (const tdesc_feature_up &feature : tdesc->features)
|
||||
{
|
||||
buffer += "<xi:include href=\"";
|
||||
buffer += xml;
|
||||
buffer += feature->name;
|
||||
buffer += "\"/>";
|
||||
}
|
||||
|
||||
|
|
@ -167,19 +166,16 @@ tdesc_get_features_xml (target_desc *tdesc)
|
|||
}
|
||||
#endif
|
||||
|
||||
struct tdesc_type
|
||||
{};
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
struct tdesc_feature *
|
||||
tdesc_create_feature (struct target_desc *tdesc, const char *name,
|
||||
const char *xml)
|
||||
{
|
||||
#ifndef IN_PROCESS_AGENT
|
||||
tdesc->features.emplace_back (xml);
|
||||
#endif
|
||||
return tdesc;
|
||||
struct tdesc_feature *new_feature = new tdesc_feature
|
||||
(xml != nullptr ? xml : name);
|
||||
tdesc->features.emplace_back (new_feature);
|
||||
return new_feature;
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
|
@ -224,21 +220,6 @@ tdesc_create_struct (struct tdesc_feature *feature, const char *id)
|
|||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_create_reg (struct tdesc_feature *feature, const char *name,
|
||||
int regnum, int save_restore, const char *group,
|
||||
int bitsize, const char *type)
|
||||
{
|
||||
struct target_desc *tdesc = (struct target_desc *) feature;
|
||||
|
||||
tdesc_reg *reg = new tdesc_reg (feature, name, regnum, save_restore,
|
||||
group, bitsize, type);
|
||||
|
||||
tdesc->registers.emplace_back (reg);
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
struct tdesc_type *
|
||||
tdesc_create_vector (struct tdesc_feature *feature, const char *name,
|
||||
struct tdesc_type *field_type, int count)
|
||||
|
|
|
|||
|
|
@ -24,16 +24,10 @@
|
|||
#include "regdef.h"
|
||||
#include <vector>
|
||||
|
||||
struct tdesc_feature
|
||||
{
|
||||
/* The registers associated with this feature. */
|
||||
std::vector<tdesc_reg_up> registers;
|
||||
};
|
||||
|
||||
/* A target description. Inherit from tdesc_feature so that target_desc
|
||||
can be used as tdesc_feature. */
|
||||
|
||||
struct target_desc : tdesc_feature
|
||||
struct target_desc
|
||||
{
|
||||
/* A vector of elements of register definitions that
|
||||
describe the inferior's register set. */
|
||||
|
|
@ -42,6 +36,9 @@ struct target_desc : tdesc_feature
|
|||
/* The register cache size, in bytes. */
|
||||
int registers_size;
|
||||
|
||||
/* XML features in this target description. */
|
||||
std::vector<tdesc_feature_up> features;
|
||||
|
||||
#ifndef IN_PROCESS_AGENT
|
||||
/* An array of register names. These are the "expedite" registers:
|
||||
registers whose values are sent along with stop replies. */
|
||||
|
|
@ -56,9 +53,6 @@ struct target_desc : tdesc_feature
|
|||
fields features, arch, and osabi in tdesc_get_features_xml. */
|
||||
const char *xmltarget = NULL;
|
||||
|
||||
/* XML features in this target description. */
|
||||
std::vector<std::string> features;
|
||||
|
||||
/* The value of <architecture> element in the XML, replying GDB. */
|
||||
const char *arch = NULL;
|
||||
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ do
|
|||
echo "{"
|
||||
echo " static struct target_desc tdesc_${name}_s;"
|
||||
echo " struct target_desc *result = &tdesc_${name}_s;"
|
||||
|
||||
echo " struct tdesc_feature *feature = tdesc_create_feature (result, \"${name}\");"
|
||||
continue
|
||||
elif test "${type}" = "xmltarget"; then
|
||||
xmltarget="${entry}"
|
||||
|
|
@ -149,7 +149,7 @@ do
|
|||
echo "$0: $1 does not specify \`\`name''." 1>&2
|
||||
exit 1
|
||||
else
|
||||
echo " tdesc_create_reg ((struct tdesc_feature *) result, \"${entry}\","
|
||||
echo " tdesc_create_reg (feature, \"${entry}\","
|
||||
echo " 0, 0, NULL, ${type}, NULL);"
|
||||
|
||||
offset=`expr ${offset} + ${type}`
|
||||
|
|
|
|||
|
|
@ -67,64 +67,6 @@ struct tdesc_type_field
|
|||
int start, end;
|
||||
};
|
||||
|
||||
enum tdesc_type_kind
|
||||
{
|
||||
/* Predefined types. */
|
||||
TDESC_TYPE_BOOL,
|
||||
TDESC_TYPE_INT8,
|
||||
TDESC_TYPE_INT16,
|
||||
TDESC_TYPE_INT32,
|
||||
TDESC_TYPE_INT64,
|
||||
TDESC_TYPE_INT128,
|
||||
TDESC_TYPE_UINT8,
|
||||
TDESC_TYPE_UINT16,
|
||||
TDESC_TYPE_UINT32,
|
||||
TDESC_TYPE_UINT64,
|
||||
TDESC_TYPE_UINT128,
|
||||
TDESC_TYPE_CODE_PTR,
|
||||
TDESC_TYPE_DATA_PTR,
|
||||
TDESC_TYPE_IEEE_SINGLE,
|
||||
TDESC_TYPE_IEEE_DOUBLE,
|
||||
TDESC_TYPE_ARM_FPA_EXT,
|
||||
TDESC_TYPE_I387_EXT,
|
||||
|
||||
/* Types defined by a target feature. */
|
||||
TDESC_TYPE_VECTOR,
|
||||
TDESC_TYPE_STRUCT,
|
||||
TDESC_TYPE_UNION,
|
||||
TDESC_TYPE_FLAGS,
|
||||
TDESC_TYPE_ENUM
|
||||
};
|
||||
|
||||
struct tdesc_type : tdesc_element
|
||||
{
|
||||
tdesc_type (const std::string &name_, enum tdesc_type_kind kind_)
|
||||
: name (name_), kind (kind_)
|
||||
{}
|
||||
|
||||
virtual ~tdesc_type () = default;
|
||||
|
||||
DISABLE_COPY_AND_ASSIGN (tdesc_type);
|
||||
|
||||
/* The name of this type. */
|
||||
std::string name;
|
||||
|
||||
/* Identify the kind of this type. */
|
||||
enum tdesc_type_kind kind;
|
||||
|
||||
bool operator== (const tdesc_type &other) const
|
||||
{
|
||||
return name == other.name && kind == other.kind;
|
||||
}
|
||||
|
||||
bool operator!= (const tdesc_type &other) const
|
||||
{
|
||||
return !(*this == other);
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::unique_ptr<tdesc_type> tdesc_type_up;
|
||||
|
||||
struct tdesc_type_builtin : tdesc_type
|
||||
{
|
||||
tdesc_type_builtin (const std::string &name, enum tdesc_type_kind kind)
|
||||
|
|
@ -428,82 +370,6 @@ make_gdb_type (struct gdbarch *gdbarch, struct tdesc_type *ttype)
|
|||
return gdb_type.get_type ();
|
||||
}
|
||||
|
||||
/* A feature from a target description. Each feature is a collection
|
||||
of other elements, e.g. registers and types. */
|
||||
|
||||
struct tdesc_feature : tdesc_element
|
||||
{
|
||||
tdesc_feature (const std::string &name_)
|
||||
: name (name_)
|
||||
{}
|
||||
|
||||
virtual ~tdesc_feature () = default;
|
||||
|
||||
DISABLE_COPY_AND_ASSIGN (tdesc_feature);
|
||||
|
||||
/* The name of this feature. It may be recognized by the architecture
|
||||
support code. */
|
||||
std::string name;
|
||||
|
||||
/* The registers associated with this feature. */
|
||||
std::vector<tdesc_reg_up> registers;
|
||||
|
||||
/* The types associated with this feature. */
|
||||
std::vector<tdesc_type_up> types;
|
||||
|
||||
void accept (tdesc_element_visitor &v) const override
|
||||
{
|
||||
v.visit_pre (this);
|
||||
|
||||
for (const tdesc_type_up &type : types)
|
||||
type->accept (v);
|
||||
|
||||
for (const tdesc_reg_up ® : registers)
|
||||
reg->accept (v);
|
||||
|
||||
v.visit_post (this);
|
||||
}
|
||||
|
||||
bool operator== (const tdesc_feature &other) const
|
||||
{
|
||||
if (name != other.name)
|
||||
return false;
|
||||
|
||||
if (registers.size () != other.registers.size ())
|
||||
return false;
|
||||
|
||||
for (int ix = 0; ix < registers.size (); ix++)
|
||||
{
|
||||
const tdesc_reg_up ®1 = registers[ix];
|
||||
const tdesc_reg_up ®2 = other.registers[ix];
|
||||
|
||||
if (reg1 != reg2 && *reg1 != *reg2)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (types.size () != other.types.size ())
|
||||
return false;
|
||||
|
||||
for (int ix = 0; ix < types.size (); ix++)
|
||||
{
|
||||
const tdesc_type_up &type1 = types[ix];
|
||||
const tdesc_type_up &type2 = other.types[ix];
|
||||
|
||||
if (type1 != type2 && *type1 != *type2)
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool operator!= (const tdesc_feature &other) const
|
||||
{
|
||||
return !(*this == other);
|
||||
}
|
||||
};
|
||||
|
||||
typedef std::unique_ptr<tdesc_feature> tdesc_feature_up;
|
||||
|
||||
/* A target description. */
|
||||
|
||||
struct target_desc : tdesc_element
|
||||
|
|
@ -1358,20 +1224,6 @@ tdesc_use_registers (struct gdbarch *gdbarch,
|
|||
tdesc_remote_register_number);
|
||||
set_gdbarch_register_reggroup_p (gdbarch, tdesc_register_reggroup_p);
|
||||
}
|
||||
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
void
|
||||
tdesc_create_reg (struct tdesc_feature *feature, const char *name,
|
||||
int regnum, int save_restore, const char *group,
|
||||
int bitsize, const char *type)
|
||||
{
|
||||
tdesc_reg *reg = new tdesc_reg (feature, name, regnum, save_restore,
|
||||
group, bitsize, type);
|
||||
|
||||
feature->registers.emplace_back (reg);
|
||||
}
|
||||
|
||||
/* See common/tdesc.h. */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue