/* Types. */
-typedef struct property
+struct property
{
- char *key;
- char *value;
-} property_s;
-DEF_VEC_O(property_s);
+ property (const std::string &key_, const std::string &value_)
+ : key (key_), value (value_)
+ {}
+
+ std::string key;
+ std::string value;
+};
/* An individual register from a target description. */
-typedef struct tdesc_reg : tdesc_element
+struct tdesc_reg : tdesc_element
{
- tdesc_reg (struct tdesc_feature *feature, const char *name_,
+ tdesc_reg (struct tdesc_feature *feature, const std::string &name_,
int regnum, int save_restore_, const char *group_,
int bitsize_, const char *type_)
- : name (xstrdup (name_)), target_regnum (regnum),
+ : name (name_), target_regnum (regnum),
save_restore (save_restore_),
- group (group_ != NULL ? xstrdup (group_) : NULL),
+ group (group_ != NULL ? group_ : ""),
bitsize (bitsize_),
- type (type_ != NULL ? xstrdup (type_) : xstrdup ("<unknown>"))
+ type (type_ != NULL ? type_ : "<unknown>")
{
/* If the register's type is target-defined, look it up now. We may not
have easy access to the containing feature when we want it later. */
- tdesc_type = tdesc_named_type (feature, type);
+ tdesc_type = tdesc_named_type (feature, type.c_str ());
}
- virtual ~tdesc_reg ()
- {
- xfree (name);
- xfree (type);
- xfree (group);
- }
+ virtual ~tdesc_reg () = default;
- /* Disable copying. */
- tdesc_reg (const tdesc_reg &) = delete;
- tdesc_reg &operator= (const tdesc_reg &) = delete;
+ DISABLE_COPY_AND_ASSIGN (tdesc_reg);
/* The name of this register. In standard features, it may be
recognized by the architecture support code, or it may be purely
for the user. */
- char *name;
+ std::string name;
/* The register number used by this target to refer to this
register. This is used for remote p/P packets and to determine
around calls to an inferior function. */
int save_restore;
- /* The name of the register group containing this register, or NULL
+ /* The name of the register group containing this register, or empty
if the group should be automatically determined from the
register's type. If this is "general", "float", or "vector", the
corresponding "info" command should display this register's
value. It can be an arbitrary string, but should be limited to
alphanumeric characters and internal hyphens. Currently other
- strings are ignored (treated as NULL). */
- char *group;
+ strings are ignored (treated as empty). */
+ std::string group;
/* The size of the register, in bits. */
int bitsize;
/* The type of the register. This string corresponds to either
a named type from the target description or a predefined
type from GDB. */
- char *type;
+ std::string type;
/* The target-described type corresponding to TYPE, if found. */
struct tdesc_type *tdesc_type;
bool operator== (const tdesc_reg &other) const
{
- return (streq (name, other.name)
+ return (name == other.name
&& target_regnum == other.target_regnum
&& save_restore == other.save_restore
&& bitsize == other.bitsize
- && (group == other.group || streq (group, other.group))
- && streq (type, other.type));
+ && group == other.group
+ && type == other.type);
}
bool operator!= (const tdesc_reg &other) const
{
return !(*this == other);
}
-} *tdesc_reg_p;
-DEF_VEC_P(tdesc_reg_p);
+};
+
+typedef std::unique_ptr<tdesc_reg> tdesc_reg_up;
/* A named type from a target description. */
TDESC_TYPE_ENUM
};
-typedef struct tdesc_type : tdesc_element
+struct tdesc_type : tdesc_element
{
tdesc_type (const char *name_, enum tdesc_type_kind kind_)
: name (xstrdup (name_)), kind (kind_)
}
xfree ((char *) name);
}
- /* Disable copying. */
- tdesc_type (const tdesc_type &) = delete;
- tdesc_type &operator= (const tdesc_type &) = delete;
+
+ DISABLE_COPY_AND_ASSIGN (tdesc_type);
/* The name of this type. If this type is a built-in type, this is
a pointer to a constant string. Otherwise, it's a
{
return !(*this == other);
}
-} *tdesc_type_p;
-DEF_VEC_P(tdesc_type_p);
+};
+
+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. */
-typedef struct tdesc_feature : tdesc_element
+struct tdesc_feature : tdesc_element
{
- tdesc_feature (const char *name_)
- : name (xstrdup (name_))
+ tdesc_feature (const std::string &name_)
+ : name (name_)
{}
- virtual ~tdesc_feature ()
- {
- struct tdesc_reg *reg;
- struct tdesc_type *type;
- int ix;
-
- for (ix = 0; VEC_iterate (tdesc_reg_p, registers, ix, reg); ix++)
- delete reg;
- VEC_free (tdesc_reg_p, registers);
-
- for (ix = 0; VEC_iterate (tdesc_type_p, types, ix, type); ix++)
- delete type;
- VEC_free (tdesc_type_p, types);
-
- xfree (name);
- }
+ virtual ~tdesc_feature () = default;
- /* Disable copying. */
- tdesc_feature (const tdesc_feature &) = delete;
- tdesc_feature &operator= (const tdesc_feature &) = delete;
+ DISABLE_COPY_AND_ASSIGN (tdesc_feature);
/* The name of this feature. It may be recognized by the architecture
support code. */
- char *name;
+ std::string name;
/* The registers associated with this feature. */
- VEC(tdesc_reg_p) *registers = NULL;
+ std::vector<std::unique_ptr<tdesc_reg>> registers;
/* The types associated with this feature. */
- VEC(tdesc_type_p) *types = NULL;
+ std::vector<tdesc_type_up> types;
void accept (tdesc_element_visitor &v) const override
{
v.visit_pre (this);
- struct tdesc_type *type;
-
- for (int ix = 0;
- VEC_iterate (tdesc_type_p, types, ix, type);
- ix++)
+ for (const tdesc_type_up &type : types)
type->accept (v);
- struct tdesc_reg *reg;
-
- for (int ix = 0;
- VEC_iterate (tdesc_reg_p, registers, ix, reg);
- ix++)
+ for (const tdesc_reg_up ® : registers)
reg->accept (v);
-
v.visit_post (this);
}
bool operator== (const tdesc_feature &other) const
{
- if (strcmp (name, other.name) != 0)
+ if (name != other.name)
return false;
- if (VEC_length (tdesc_reg_p, registers)
- != VEC_length (tdesc_reg_p, other.registers))
+ if (registers.size () != other.registers.size ())
return false;
- struct tdesc_reg *reg;
-
- for (int ix = 0;
- VEC_iterate (tdesc_reg_p, registers, ix, reg);
- ix++)
+ for (int ix = 0; ix < registers.size (); ix++)
{
- tdesc_reg *reg2
- = VEC_index (tdesc_reg_p, other.registers, ix);
+ const tdesc_reg_up ®1 = registers[ix];
+ const tdesc_reg_up ®2 = other.registers[ix];
- if (reg != reg2 && *reg != *reg2)
+ if (reg1 != reg2 && *reg1 != *reg2)
return false;
}
- if (VEC_length (tdesc_type_p, types)
- != VEC_length (tdesc_type_p, other.types))
+ if (types.size () != other.types.size ())
return false;
- tdesc_type *type;
-
- for (int ix = 0;
- VEC_iterate (tdesc_type_p, types, ix, type);
- ix++)
+ for (int ix = 0; ix < types.size (); ix++)
{
- tdesc_type *type2
- = VEC_index (tdesc_type_p, other.types, ix);
+ const tdesc_type_up &type1 = types[ix];
+ const tdesc_type_up &type2 = other.types[ix];
- if (type != type2 && *type != *type2)
+ if (type1 != type2 && *type1 != *type2)
return false;
}
{
return !(*this == other);
}
+};
-} *tdesc_feature_p;
-DEF_VEC_P(tdesc_feature_p);
-
-/* A compatible architecture from a target description. */
-typedef const struct bfd_arch_info *arch_p;
-DEF_VEC_P(arch_p);
+typedef std::unique_ptr<tdesc_feature> tdesc_feature_up;
/* A target description. */
target_desc ()
{}
- virtual ~target_desc ()
- {
- struct tdesc_feature *feature;
- struct property *prop;
- int ix;
-
- for (ix = 0;
- VEC_iterate (tdesc_feature_p, features, ix, feature);
- ix++)
- delete feature;
- VEC_free (tdesc_feature_p, features);
-
- for (ix = 0;
- VEC_iterate (property_s, properties, ix, prop);
- ix++)
- {
- xfree (prop->key);
- xfree (prop->value);
- }
-
- VEC_free (property_s, properties);
- VEC_free (arch_p, compatible);
- }
+ virtual ~target_desc () = default;
target_desc (const target_desc &) = delete;
void operator= (const target_desc &) = delete;
enum gdb_osabi osabi = GDB_OSABI_UNKNOWN;
/* The list of compatible architectures reported by the target. */
- VEC(arch_p) *compatible = NULL;
+ std::vector<const bfd_arch_info *> compatible;
/* Any architecture-specific properties specified by the target. */
- VEC(property_s) *properties = NULL;
+ std::vector<property> properties;
/* The features associated with this target. */
- VEC(tdesc_feature_p) *features = NULL;
+ std::vector<std::unique_ptr<tdesc_feature>> features;
void accept (tdesc_element_visitor &v) const override
{
v.visit_pre (this);
- struct tdesc_feature *feature;
-
- for (int ix = 0;
- VEC_iterate (tdesc_feature_p, features, ix, feature);
- ix++)
+ for (const tdesc_feature_up &feature : features)
feature->accept (v);
v.visit_post (this);
if (osabi != other.osabi)
return false;
- if (VEC_length (tdesc_feature_p, features)
- != VEC_length (tdesc_feature_p, other.features))
+ if (features.size () != other.features.size ())
return false;
- struct tdesc_feature *feature;
-
- for (int ix = 0;
- VEC_iterate (tdesc_feature_p, features, ix, feature);
- ix++)
+ for (int ix = 0; ix < features.size (); ix++)
{
- struct tdesc_feature *feature2
- = VEC_index (tdesc_feature_p, other.features, ix);
+ const tdesc_feature_up &feature1 = features[ix];
+ const tdesc_feature_up &feature2 = other.features[ix];
- if (feature != feature2 && *feature != *feature2)
+ if (feature1 != feature2 && *feature1 != *feature2)
return false;
}
tdesc_compatible_p (const struct target_desc *target_desc,
const struct bfd_arch_info *arch)
{
- const struct bfd_arch_info *compat;
- int ix;
-
- for (ix = 0; VEC_iterate (arch_p, target_desc->compatible, ix, compat);
- ix++)
+ for (const bfd_arch_info *compat : target_desc->compatible)
{
if (compat == arch
|| arch->compatible (arch, compat)
const char *
tdesc_property (const struct target_desc *target_desc, const char *key)
{
- struct property *prop;
- int ix;
-
- for (ix = 0; VEC_iterate (property_s, target_desc->properties, ix, prop);
- ix++)
- if (strcmp (prop->key, key) == 0)
- return prop->value;
+ for (const property &prop : target_desc->properties)
+ if (prop.key == key)
+ return prop.value.c_str ();
return NULL;
}
int
tdesc_has_registers (const struct target_desc *target_desc)
{
- int ix;
- struct tdesc_feature *feature;
-
if (target_desc == NULL)
return 0;
- for (ix = 0;
- VEC_iterate (tdesc_feature_p, target_desc->features, ix, feature);
- ix++)
- if (! VEC_empty (tdesc_reg_p, feature->registers))
+ for (const tdesc_feature_up &feature : target_desc->features)
+ if (!feature->registers.empty ())
return 1;
return 0;
tdesc_find_feature (const struct target_desc *target_desc,
const char *name)
{
- int ix;
- struct tdesc_feature *feature;
-
- for (ix = 0;
- VEC_iterate (tdesc_feature_p, target_desc->features, ix, feature);
- ix++)
- if (strcmp (feature->name, name) == 0)
- return feature;
+ for (const tdesc_feature_up &feature : target_desc->features)
+ if (feature->name == name)
+ return feature.get ();
return NULL;
}
const char *
tdesc_feature_name (const struct tdesc_feature *feature)
{
- return feature->name;
+ return feature->name.c_str ();
}
/* Predefined types. */
static struct tdesc_type *
tdesc_predefined_type (enum tdesc_type_kind kind)
{
- int ix;
- struct tdesc_type *type;
-
- for (ix = 0; ix < ARRAY_SIZE (tdesc_predefined_types); ix++)
+ 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");
}
-/* Return the type associated with ID in the context of FEATURE, or
- NULL if none. */
+/* See arch/tdesc.h. */
struct tdesc_type *
tdesc_named_type (const struct tdesc_feature *feature, const char *id)
{
- int ix;
- struct tdesc_type *type;
-
/* First try target-defined types. */
- for (ix = 0; VEC_iterate (tdesc_type_p, feature->types, ix, type); ix++)
+ for (const tdesc_type_up &type : feature->types)
if (strcmp (type->name, id) == 0)
- return type;
+ return type.get ();
/* Next try the predefined types. */
- for (ix = 0; ix < ARRAY_SIZE (tdesc_predefined_types); ix++)
+ for (int ix = 0; ix < ARRAY_SIZE (tdesc_predefined_types); ix++)
if (strcmp (tdesc_predefined_types[ix].name, id) == 0)
return &tdesc_predefined_types[ix];
int ix;
type = arch_flags_type (gdbarch, tdesc_type->name,
- tdesc_type->u.u.size);
+ tdesc_type->u.u.size * TARGET_CHAR_BIT);
for (ix = 0;
VEC_iterate (tdesc_type_field, tdesc_type->u.u.fields, ix, f);
ix++)
int ix;
type = arch_type (gdbarch, TYPE_CODE_ENUM,
- tdesc_type->u.u.size, tdesc_type->name);
+ tdesc_type->u.u.size * TARGET_CHAR_BIT,
+ tdesc_type->name);
TYPE_UNSIGNED (type) = 1;
for (ix = 0;
VEC_iterate (tdesc_type_field, tdesc_type->u.u.fields, ix, f);
tdesc_find_register_early (const struct tdesc_feature *feature,
const char *name)
{
- int ixr;
- struct tdesc_reg *reg;
-
- for (ixr = 0;
- VEC_iterate (tdesc_reg_p, feature->registers, ixr, reg);
- ixr++)
- if (strcasecmp (reg->name, name) == 0)
- return reg;
+ for (const tdesc_reg_up ® : feature->registers)
+ if (strcasecmp (reg->name.c_str (), name) == 0)
+ return reg.get ();
return NULL;
}
int num_pseudo_regs = gdbarch_num_pseudo_regs (gdbarch);
if (reg != NULL)
- return reg->name;
+ return reg->name.c_str ();
if (regno >= num_regs && regno < num_regs + num_pseudo_regs)
{
arch_reg->type = tdesc_gdb_type (gdbarch, reg->tdesc_type);
/* Next try size-sensitive type shortcuts. */
- else if (strcmp (reg->type, "float") == 0)
+ else if (reg->type == "float")
{
if (reg->bitsize == gdbarch_float_bit (gdbarch))
arch_reg->type = builtin_type (gdbarch)->builtin_float;
else
{
warning (_("Register \"%s\" has an unsupported size (%d bits)"),
- reg->name, reg->bitsize);
+ reg->name.c_str (), reg->bitsize);
arch_reg->type = builtin_type (gdbarch)->builtin_double;
}
}
- else if (strcmp (reg->type, "int") == 0)
+ else if (reg->type == "int")
{
if (reg->bitsize == gdbarch_long_bit (gdbarch))
arch_reg->type = builtin_type (gdbarch)->builtin_long;
else
{
warning (_("Register \"%s\" has an unsupported size (%d bits)"),
- reg->name, reg->bitsize);
+ reg->name.c_str (), reg->bitsize);
arch_reg->type = builtin_type (gdbarch)->builtin_long;
}
}
if (arch_reg->type == NULL)
internal_error (__FILE__, __LINE__,
"Register \"%s\" has an unknown type \"%s\"",
- reg->name, reg->type);
+ reg->name.c_str (), reg->type.c_str ());
}
return arch_reg->type;
{
struct tdesc_reg *reg = tdesc_find_register (gdbarch, regno);
- if (reg != NULL && reg->group != NULL)
+ if (reg != NULL && !reg->group.empty ())
{
int general_p = 0, float_p = 0, vector_p = 0;
- if (strcmp (reg->group, "general") == 0)
+ if (reg->group == "general")
general_p = 1;
- else if (strcmp (reg->group, "float") == 0)
+ else if (reg->group == "float")
float_p = 1;
- else if (strcmp (reg->group, "vector") == 0)
+ else if (reg->group == "vector")
vector_p = 1;
if (reggroup == float_reggroup)
struct tdesc_arch_data *early_data)
{
int num_regs = gdbarch_num_regs (gdbarch);
- int ixf, ixr;
- struct tdesc_feature *feature;
- struct tdesc_reg *reg;
struct tdesc_arch_data *data;
struct tdesc_arch_reg *arch_reg, new_arch_reg = { 0 };
htab_t reg_hash;
numbers where needed. The hash table expands as necessary, so
the initial size is arbitrary. */
reg_hash = htab_create (37, htab_hash_pointer, htab_eq_pointer, NULL);
- for (ixf = 0;
- VEC_iterate (tdesc_feature_p, target_desc->features, ixf, feature);
- ixf++)
- for (ixr = 0;
- VEC_iterate (tdesc_reg_p, feature->registers, ixr, reg);
- ixr++)
+ for (const tdesc_feature_up &feature : target_desc->features)
+ for (const tdesc_reg_up ® : feature->registers)
{
- void **slot = htab_find_slot (reg_hash, reg, INSERT);
+ void **slot = htab_find_slot (reg_hash, reg.get (), INSERT);
- *slot = reg;
+ *slot = reg.get ();
}
/* Remove any registers which were assigned numbers by the
architecture. */
- for (ixr = 0;
+ for (int ixr = 0;
VEC_iterate (tdesc_arch_reg, data->arch_regs, ixr, arch_reg);
ixr++)
if (arch_reg->reg)
gdb_assert (VEC_length (tdesc_arch_reg, data->arch_regs) <= num_regs);
while (VEC_length (tdesc_arch_reg, data->arch_regs) < num_regs)
VEC_safe_push (tdesc_arch_reg, data->arch_regs, &new_arch_reg);
- for (ixf = 0;
- VEC_iterate (tdesc_feature_p, target_desc->features, ixf, feature);
- ixf++)
- for (ixr = 0;
- VEC_iterate (tdesc_reg_p, feature->registers, ixr, reg);
- ixr++)
- if (htab_find (reg_hash, reg) != NULL)
+ for (const tdesc_feature_up &feature : target_desc->features)
+ for (const tdesc_reg_up ® : feature->registers)
+ if (htab_find (reg_hash, reg.get ()) != NULL)
{
- new_arch_reg.reg = reg;
+ new_arch_reg.reg = reg.get ();
VEC_safe_push (tdesc_arch_reg, data->arch_regs, &new_arch_reg);
num_regs++;
}
}
\f
+/* See arch/tdesc.h. */
+
void
tdesc_create_reg (struct tdesc_feature *feature, const char *name,
int regnum, int save_restore, const char *group,
tdesc_reg *reg = new tdesc_reg (feature, name, regnum, save_restore,
group, bitsize, type);
- VEC_safe_push (tdesc_reg_p, feature->registers, reg);
+ feature->registers.emplace_back (reg);
}
+/* See arch/tdesc.h. */
+
struct tdesc_type *
tdesc_create_vector (struct tdesc_feature *feature, const char *name,
struct tdesc_type *field_type, int count)
type->u.v.type = field_type;
type->u.v.count = count;
- VEC_safe_push (tdesc_type_p, feature->types, type);
+ feature->types.emplace_back (type);
return type;
}
+/* See arch/tdesc.h. */
+
struct tdesc_type *
tdesc_create_struct (struct tdesc_feature *feature, const char *name)
{
struct tdesc_type *type = new tdesc_type (name, TDESC_TYPE_STRUCT);
- VEC_safe_push (tdesc_type_p, feature->types, type);
+ feature->types.emplace_back (type);
return type;
}
-/* Set the total length of TYPE. Structs which contain bitfields may
- omit the reserved bits, so the end of the last field may not
- suffice. */
+/* See arch/tdesc.h. */
void
tdesc_set_struct_size (struct tdesc_type *type, int size)
type->u.u.size = size;
}
+/* See arch/tdesc.h. */
+
struct tdesc_type *
tdesc_create_union (struct tdesc_feature *feature, const char *name)
{
struct tdesc_type *type = new tdesc_type (name, TDESC_TYPE_UNION);
- VEC_safe_push (tdesc_type_p, feature->types, type);
+ feature->types.emplace_back (type);
return type;
}
+/* See arch/tdesc.h. */
+
struct tdesc_type *
tdesc_create_flags (struct tdesc_feature *feature, const char *name,
int size)
type->u.u.size = size;
- VEC_safe_push (tdesc_type_p, feature->types, type);
+ feature->types.emplace_back (type);
return type;
}
type->u.u.size = size;
- VEC_safe_push (tdesc_type_p, feature->types, type);
+ feature->types.emplace_back (type);
return type;
}
-/* Add a new field to TYPE. */
+/* See arch/tdesc.h. */
void
tdesc_add_field (struct tdesc_type *type, const char *field_name,
VEC_safe_push (tdesc_type_field, type->u.u.fields, &f);
}
-/* Add a new typed bitfield to TYPE. */
-
void
tdesc_add_typed_bitfield (struct tdesc_type *type, const char *field_name,
int start, int end, struct tdesc_type *field_type)
VEC_safe_push (tdesc_type_field, type->u.u.fields, &f);
}
-/* Add a new untyped bitfield to TYPE.
- Untyped bitfields become either uint32 or uint64 depending on the size
- of the underlying type. */
+/* See arch/tdesc.h. */
void
tdesc_add_bitfield (struct tdesc_type *type, const char *field_name,
tdesc_add_typed_bitfield (type, field_name, start, end, field_type);
}
-/* A flag is just a typed(bool) single-bit bitfield.
- This function is kept to minimize changes in generated files. */
+/* See arch/tdesc.h. */
void
tdesc_add_flag (struct tdesc_type *type, int start,
VEC_safe_push (tdesc_type_field, type->u.u.fields, &f);
}
+/* See arch/tdesc.h. */
+
struct tdesc_feature *
-tdesc_create_feature (struct target_desc *tdesc, const char *name)
+tdesc_create_feature (struct target_desc *tdesc, const char *name,
+ const char *xml)
{
struct tdesc_feature *new_feature = new tdesc_feature (name);
- VEC_safe_push (tdesc_feature_p, tdesc->features, new_feature);
+ tdesc->features.emplace_back (new_feature);
+
return new_feature;
}
tdesc_add_compatible (struct target_desc *target_desc,
const struct bfd_arch_info *compatible)
{
- const struct bfd_arch_info *compat;
- int ix;
-
/* If this instance of GDB is compiled without BFD support for the
compatible architecture, simply ignore it -- we would not be able
to handle it anyway. */
if (compatible == NULL)
return;
- for (ix = 0; VEC_iterate (arch_p, target_desc->compatible, ix, compat);
- ix++)
+ for (const bfd_arch_info *compat : target_desc->compatible)
if (compat == compatible)
internal_error (__FILE__, __LINE__,
_("Attempted to add duplicate "
"compatible architecture \"%s\""),
compatible->printable_name);
- VEC_safe_push (arch_p, target_desc->compatible, compatible);
+ target_desc->compatible.push_back (compatible);
}
void
set_tdesc_property (struct target_desc *target_desc,
const char *key, const char *value)
{
- struct property *prop, new_prop;
- int ix;
-
gdb_assert (key != NULL && value != NULL);
- for (ix = 0; VEC_iterate (property_s, target_desc->properties, ix, prop);
- ix++)
- if (strcmp (prop->key, key) == 0)
- internal_error (__FILE__, __LINE__,
- _("Attempted to add duplicate property \"%s\""), key);
+ if (tdesc_property (target_desc, key) != NULL)
+ internal_error (__FILE__, __LINE__,
+ _("Attempted to add duplicate property \"%s\""), key);
- new_prop.key = xstrdup (key);
- new_prop.value = xstrdup (value);
- VEC_safe_push (property_s, target_desc->properties, &new_prop);
+ target_desc->properties.emplace_back (key, value);
+}
+
+/* See arch/tdesc.h. */
+
+void
+set_tdesc_architecture (struct target_desc *target_desc,
+ const char *name)
+{
+ set_tdesc_architecture (target_desc, bfd_scan_arch (name));
}
void
target_desc->arch = arch;
}
+/* See arch/tdesc.h. */
+
+void
+set_tdesc_osabi (struct target_desc *target_desc, const char *name)
+{
+ set_tdesc_osabi (target_desc, osabi_from_tdesc_string (name));
+}
+
void
set_tdesc_osabi (struct target_desc *target_desc, enum gdb_osabi osabi)
{
/* Helper functions for the CLI commands. */
static void
-set_tdesc_cmd (char *args, int from_tty)
+set_tdesc_cmd (const char *args, int from_tty)
{
help_list (tdesc_set_cmdlist, "set tdesc ", all_commands, gdb_stdout);
}
static void
-show_tdesc_cmd (char *args, int from_tty)
+show_tdesc_cmd (const char *args, int from_tty)
{
cmd_show_list (tdesc_show_cmdlist, from_tty, "");
}
static void
-unset_tdesc_cmd (char *args, int from_tty)
+unset_tdesc_cmd (const char *args, int from_tty)
{
help_list (tdesc_unset_cmdlist, "unset tdesc ", all_commands, gdb_stdout);
}
static void
-set_tdesc_filename_cmd (char *args, int from_tty,
+set_tdesc_filename_cmd (const char *args, int from_tty,
struct cmd_list_element *c)
{
xfree (target_description_filename);
}
static void
-unset_tdesc_filename_cmd (char *args, int from_tty)
+unset_tdesc_filename_cmd (const char *args, int from_tty)
{
xfree (target_description_filename);
target_description_filename = NULL;
printf_unfiltered ("\n");
}
- int ix;
- const struct bfd_arch_info *compatible;
- struct property *prop;
+ for (const struct bfd_arch_info *compatible : e->compatible)
+ printf_unfiltered
+ (" tdesc_add_compatible (result, bfd_scan_arch (\"%s\"));\n",
+ compatible->printable_name);
- for (ix = 0; VEC_iterate (arch_p, e->compatible, ix, compatible);
- ix++)
- {
- printf_unfiltered
- (" tdesc_add_compatible (result, bfd_scan_arch (\"%s\"));\n",
- compatible->printable_name);
- }
-
- if (ix)
+ if (!e->compatible.empty ())
printf_unfiltered ("\n");
- for (ix = 0; VEC_iterate (property_s, e->properties, ix, prop);
- ix++)
- {
- printf_unfiltered (" set_tdesc_property (result, \"%s\", \"%s\");\n",
- prop->key, prop->value);
- }
+ for (const property &prop : e->properties)
+ printf_unfiltered (" set_tdesc_property (result, \"%s\", \"%s\");\n",
+ prop.key.c_str (), prop.value.c_str ());
+
printf_unfiltered (" struct tdesc_feature *feature;\n");
}
void visit_pre (const tdesc_feature *e) override
{
printf_unfiltered ("\n feature = tdesc_create_feature (result, \"%s\");\n",
- e->name);
+ e->name.c_str ());
}
void visit_post (const tdesc_feature *e) override
void visit (const tdesc_reg *reg) override
{
printf_unfiltered (" tdesc_create_reg (feature, \"%s\", %ld, %d, ",
- reg->name, reg->target_regnum, reg->save_restore);
- if (reg->group)
- printf_unfiltered ("\"%s\", ", reg->group);
+ reg->name.c_str (), reg->target_regnum,
+ reg->save_restore);
+ if (!reg->group.empty ())
+ printf_unfiltered ("\"%s\", ", reg->group.c_str ());
else
printf_unfiltered ("NULL, ");
- printf_unfiltered ("%d, \"%s\");\n", reg->bitsize, reg->type);
+ printf_unfiltered ("%d, \"%s\");\n", reg->bitsize, reg->type.c_str ());
}
protected:
printf_unfiltered (" Original: %s */\n\n",
lbasename (m_filename_after_features.c_str ()));
- printf_unfiltered ("#include \"target-descriptions.h\"\n");
+ printf_unfiltered ("#include \"arch/tdesc.h\"\n");
printf_unfiltered ("\n");
}
printf_unfiltered ("{\n");
printf_unfiltered (" struct tdesc_feature *feature;\n");
- printf_unfiltered ("\n feature = tdesc_create_feature (result, \"%s\");\n",
- e->name);
+
+ printf_unfiltered
+ ("\n feature = tdesc_create_feature (result, \"%s\", \"%s\");\n",
+ e->name.c_str (), lbasename (m_filename_after_features.c_str ()));
}
void visit_post (const tdesc_feature *e) override
}
printf_unfiltered (" tdesc_create_reg (feature, \"%s\", regnum++, %d, ",
- reg->name, reg->save_restore);
- if (reg->group)
- printf_unfiltered ("\"%s\", ", reg->group);
+ reg->name.c_str (), reg->save_restore);
+ if (!reg->group.empty ())
+ printf_unfiltered ("\"%s\", ", reg->group.c_str ());
else
printf_unfiltered ("NULL, ");
- printf_unfiltered ("%d, \"%s\");\n", reg->bitsize, reg->type);
+ printf_unfiltered ("%d, \"%s\");\n", reg->bitsize, reg->type.c_str ());
m_next_regnum++;
}
};
static void
-maint_print_c_tdesc_cmd (char *args, int from_tty)
+maint_print_c_tdesc_cmd (const char *args, int from_tty)
{
const struct target_desc *tdesc;
const char *filename;
/* Print c files for target features instead of target descriptions,
because c files got from target features are more flexible than the
counterparts. */
- if (startswith (filename_after_features.c_str (), "i386/32bit-"))
+ if (startswith (filename_after_features.c_str (), "i386/32bit-")
+ || startswith (filename_after_features.c_str (), "i386/64bit-")
+ || startswith (filename_after_features.c_str (), "i386/x32-core.xml")
+ || startswith (filename_after_features.c_str (), "tic6x-")
+ || startswith (filename_after_features.c_str (), "aarch64"))
{
print_c_feature v (filename_after_features);
found in the specified directory DIR. */
static void
-maintenance_check_xml_descriptions (char *dir, int from_tty)
+maintenance_check_xml_descriptions (const char *dir, int from_tty)
{
if (dir == NULL)
error (_("Missing dir name"));
(long) selftests::xml_tdesc.size (), failed);
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_target_descriptions;
-
void
_initialize_target_descriptions (void)
{