+
+/* Return the OSABI associated with this target description, or
+ GDB_OSABI_UNKNOWN if no osabi was specified. */
+
+enum gdb_osabi
+tdesc_osabi (const struct target_desc *target_desc)
+{
+ return target_desc->osabi;
+}
+
+\f
+
+/* Return 1 if this target description includes any registers. */
+
+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))
+ return 1;
+
+ return 0;
+}
+
+/* Return the feature with the given name, if present, or NULL if
+ the named feature is not found. */
+
+const struct tdesc_feature *
+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;
+
+ return NULL;
+}
+
+/* Return the name of FEATURE. */
+
+const char *
+tdesc_feature_name (const struct tdesc_feature *feature)
+{
+ return feature->name;
+}
+
+/* Predefined types. */
+static struct tdesc_type tdesc_predefined_types[] =
+{
+ { "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 }
+};
+
+/* Return the type associated with ID in the context of FEATURE, or
+ NULL if none. */
+
+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++)
+ if (strcmp (type->name, id) == 0)
+ return type;
+
+ /* Next try the predefined types. */
+ for (ix = 0; ix < ARRAY_SIZE (tdesc_predefined_types); ix++)
+ if (strcmp (tdesc_predefined_types[ix].name, id) == 0)
+ return &tdesc_predefined_types[ix];
+
+ return NULL;
+}
+
+/* Lookup type associated with ID. */
+
+struct type *
+tdesc_find_type (struct gdbarch *gdbarch, const char *id)
+{
+ struct tdesc_arch_reg *reg;
+ struct tdesc_arch_data *data;
+ int i, num_regs;
+
+ data = gdbarch_data (gdbarch, tdesc_data);
+ num_regs = VEC_length (tdesc_arch_reg, data->arch_regs);
+ for (i = 0; i < num_regs; i++)
+ {
+ reg = VEC_index (tdesc_arch_reg, data->arch_regs, i);
+ if (reg->reg
+ && reg->reg->tdesc_type
+ && reg->type
+ && strcmp (id, reg->reg->tdesc_type->name) == 0)
+ return reg->type;
+ }
+
+ return NULL;
+}
+
+/* Construct, if necessary, and return the GDB type implementing target
+ type TDESC_TYPE for architecture GDBARCH. */
+
+static struct type *
+tdesc_gdb_type (struct gdbarch *gdbarch, struct tdesc_type *tdesc_type)
+{
+ struct type *type;
+
+ switch (tdesc_type->kind)
+ {
+ /* Predefined types. */
+ 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;
+
+ default:
+ break;
+ }
+
+ type = tdesc_find_type (gdbarch, tdesc_type->name);
+ if (type)
+ return type;
+
+ switch (tdesc_type->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);
+
+ /* Types defined by a target feature. */
+ case TDESC_TYPE_VECTOR:
+ {
+ struct type *type, *field_type;
+
+ field_type = tdesc_gdb_type (gdbarch, tdesc_type->u.v.type);
+ type = init_vector_type (field_type, tdesc_type->u.v.count);
+ TYPE_NAME (type) = xstrdup (tdesc_type->name);
+
+ return type;
+ }
+
+ case TDESC_TYPE_STRUCT:
+ {
+ struct type *type, *field_type;
+ struct tdesc_type_field *f;
+ int ix;
+
+ type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
+ TYPE_NAME (type) = xstrdup (tdesc_type->name);
+ TYPE_TAG_NAME (type) = TYPE_NAME (type);
+
+ for (ix = 0;
+ VEC_iterate (tdesc_type_field, tdesc_type->u.u.fields, ix, f);
+ ix++)
+ {
+ if (f->type == NULL)
+ {
+ /* Bitfield. */
+ struct field *fld;
+ struct type *field_type;
+ int bitsize, total_size;
+
+ /* This invariant should be preserved while creating
+ types. */
+ gdb_assert (tdesc_type->u.u.size != 0);
+ if (tdesc_type->u.u.size > 4)
+ field_type = builtin_type (gdbarch)->builtin_uint64;
+ else
+ field_type = builtin_type (gdbarch)->builtin_uint32;
+
+ fld = append_composite_type_field_raw (type, xstrdup (f->name),
+ field_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 = tdesc_type->u.u.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
+ {
+ field_type = tdesc_gdb_type (gdbarch, f->type);
+ append_composite_type_field (type, xstrdup (f->name),
+ field_type);
+ }
+ }
+
+ if (tdesc_type->u.u.size != 0)
+ TYPE_LENGTH (type) = tdesc_type->u.u.size;
+ return type;
+ }
+
+ case TDESC_TYPE_UNION:
+ {
+ struct type *type, *field_type;
+ struct tdesc_type_field *f;
+ int ix;
+
+ type = arch_composite_type (gdbarch, NULL, TYPE_CODE_UNION);
+ TYPE_NAME (type) = xstrdup (tdesc_type->name);
+
+ for (ix = 0;
+ VEC_iterate (tdesc_type_field, tdesc_type->u.u.fields, ix, f);
+ ix++)
+ {
+ field_type = tdesc_gdb_type (gdbarch, f->type);
+ append_composite_type_field (type, xstrdup (f->name), field_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_type))
+ TYPE_VECTOR (type) = 1;
+ }
+ return type;
+ }
+
+ case TDESC_TYPE_FLAGS:
+ {
+ struct tdesc_type_flag *f;
+ int ix;
+
+ type = arch_flags_type (gdbarch, tdesc_type->name,
+ tdesc_type->u.f.size);
+ for (ix = 0;
+ VEC_iterate (tdesc_type_flag, tdesc_type->u.f.flags, ix, f);
+ ix++)
+ /* Note that contrary to the function name, this call will
+ just set the properties of an already-allocated
+ field. */
+ append_flags_type_flag (type, f->start,
+ *f->name ? f->name : NULL);
+
+ return type;
+ }
+ }
+
+ internal_error (__FILE__, __LINE__,
+ "Type \"%s\" has an unknown kind %d",
+ tdesc_type->name, tdesc_type->kind);
+}
+\f
+
+/* Support for registers from target descriptions. */
+
+/* Construct the per-gdbarch data. */
+
+static void *
+tdesc_data_init (struct obstack *obstack)
+{
+ struct tdesc_arch_data *data;
+
+ data = OBSTACK_ZALLOC (obstack, struct tdesc_arch_data);
+ return data;
+}
+
+/* Similar, but for the temporary copy used during architecture
+ initialization. */
+
+struct tdesc_arch_data *
+tdesc_data_alloc (void)
+{
+ return XZALLOC (struct tdesc_arch_data);
+}
+
+/* Free something allocated by tdesc_data_alloc, if it is not going
+ to be used (for instance if it was unsuitable for the
+ architecture). */
+
+void
+tdesc_data_cleanup (void *data_untyped)
+{
+ struct tdesc_arch_data *data = data_untyped;
+
+ VEC_free (tdesc_arch_reg, data->arch_regs);
+ xfree (data);
+}
+
+/* Search FEATURE for a register named NAME. */
+
+static struct tdesc_reg *
+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;
+
+ return NULL;
+}
+
+/* Search FEATURE for a register named NAME. Assign REGNO to it. */
+
+int
+tdesc_numbered_register (const struct tdesc_feature *feature,
+ struct tdesc_arch_data *data,
+ int regno, const char *name)
+{
+ struct tdesc_arch_reg arch_reg = { 0 };
+ struct tdesc_reg *reg = tdesc_find_register_early (feature, name);
+
+ if (reg == NULL)
+ return 0;
+
+ /* Make sure the vector includes a REGNO'th element. */
+ while (regno >= VEC_length (tdesc_arch_reg, data->arch_regs))
+ VEC_safe_push (tdesc_arch_reg, data->arch_regs, &arch_reg);
+
+ arch_reg.reg = reg;
+ VEC_replace (tdesc_arch_reg, data->arch_regs, regno, &arch_reg);
+ return 1;
+}
+
+/* Search FEATURE for a register named NAME, but do not assign a fixed
+ register number to it. */
+
+int
+tdesc_unnumbered_register (const struct tdesc_feature *feature,
+ const char *name)
+{
+ struct tdesc_reg *reg = tdesc_find_register_early (feature, name);
+
+ if (reg == NULL)
+ return 0;
+
+ return 1;
+}
+
+/* Search FEATURE for a register whose name is in NAMES and assign
+ REGNO to it. */
+
+int
+tdesc_numbered_register_choices (const struct tdesc_feature *feature,
+ struct tdesc_arch_data *data,
+ int regno, const char *const names[])
+{
+ int i;
+
+ for (i = 0; names[i] != NULL; i++)
+ if (tdesc_numbered_register (feature, data, regno, names[i]))
+ return 1;
+
+ return 0;
+}
+
+/* Search FEATURE for a register named NAME, and return its size in
+ bits. The register must exist. */
+
+int
+tdesc_register_size (const struct tdesc_feature *feature,
+ const char *name)
+{
+ struct tdesc_reg *reg = tdesc_find_register_early (feature, name);
+
+ gdb_assert (reg != NULL);
+ return reg->bitsize;
+}
+
+/* Look up a register by its GDB internal register number. */
+
+static struct tdesc_arch_reg *
+tdesc_find_arch_register (struct gdbarch *gdbarch, int regno)
+{
+ struct tdesc_arch_data *data;
+
+ data = gdbarch_data (gdbarch, tdesc_data);
+ if (regno < VEC_length (tdesc_arch_reg, data->arch_regs))
+ return VEC_index (tdesc_arch_reg, data->arch_regs, regno);
+ else
+ return NULL;
+}
+
+static struct tdesc_reg *
+tdesc_find_register (struct gdbarch *gdbarch, int regno)
+{
+ struct tdesc_arch_reg *reg = tdesc_find_arch_register (gdbarch, regno);
+
+ return reg? reg->reg : NULL;
+}
+
+/* Return the name of register REGNO, from the target description or
+ from an architecture-provided pseudo_register_name method. */
+
+const char *
+tdesc_register_name (struct gdbarch *gdbarch, int regno)
+{
+ struct tdesc_reg *reg = tdesc_find_register (gdbarch, regno);
+ int num_regs = gdbarch_num_regs (gdbarch);
+ int num_pseudo_regs = gdbarch_num_pseudo_regs (gdbarch);
+
+ if (reg != NULL)
+ return reg->name;
+
+ if (regno >= num_regs && regno < num_regs + num_pseudo_regs)
+ {
+ struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data);
+
+ gdb_assert (data->pseudo_register_name != NULL);
+ return data->pseudo_register_name (gdbarch, regno);
+ }
+
+ return "";
+}
+
+struct type *
+tdesc_register_type (struct gdbarch *gdbarch, int regno)
+{
+ struct tdesc_arch_reg *arch_reg = tdesc_find_arch_register (gdbarch, regno);
+ struct tdesc_reg *reg = arch_reg? arch_reg->reg : NULL;
+ int num_regs = gdbarch_num_regs (gdbarch);
+ int num_pseudo_regs = gdbarch_num_pseudo_regs (gdbarch);
+
+ if (reg == NULL && regno >= num_regs && regno < num_regs + num_pseudo_regs)
+ {
+ struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data);
+
+ gdb_assert (data->pseudo_register_type != NULL);
+ return data->pseudo_register_type (gdbarch, regno);
+ }
+
+ if (reg == NULL)
+ /* Return "int0_t", since "void" has a misleading size of one. */
+ return builtin_type (gdbarch)->builtin_int0;
+
+ if (arch_reg->type == NULL)
+ {
+ /* First check for a predefined or target defined type. */
+ if (reg->tdesc_type)
+ arch_reg->type = tdesc_gdb_type (gdbarch, reg->tdesc_type);
+
+ /* Next try size-sensitive type shortcuts. */
+ else if (strcmp (reg->type, "float") == 0)
+ {
+ if (reg->bitsize == gdbarch_float_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_float;
+ else if (reg->bitsize == gdbarch_double_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_double;
+ else if (reg->bitsize == gdbarch_long_double_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_long_double;
+ else
+ {
+ warning (_("Register \"%s\" has an unsupported size (%d bits)"),
+ reg->name, reg->bitsize);
+ arch_reg->type = builtin_type (gdbarch)->builtin_double;
+ }
+ }
+ else if (strcmp (reg->type, "int") == 0)
+ {
+ if (reg->bitsize == gdbarch_long_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_long;
+ else if (reg->bitsize == TARGET_CHAR_BIT)
+ arch_reg->type = builtin_type (gdbarch)->builtin_char;
+ else if (reg->bitsize == gdbarch_short_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_short;
+ else if (reg->bitsize == gdbarch_int_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_int;
+ else if (reg->bitsize == gdbarch_long_long_bit (gdbarch))
+ arch_reg->type = builtin_type (gdbarch)->builtin_long_long;
+ else if (reg->bitsize == gdbarch_ptr_bit (gdbarch))
+ /* A bit desperate by this point... */
+ arch_reg->type = builtin_type (gdbarch)->builtin_data_ptr;
+ else
+ {
+ warning (_("Register \"%s\" has an unsupported size (%d bits)"),
+ reg->name, 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);
+ }
+
+ return arch_reg->type;
+}
+
+static int
+tdesc_remote_register_number (struct gdbarch *gdbarch, int regno)
+{
+ struct tdesc_reg *reg = tdesc_find_register (gdbarch, regno);
+
+ if (reg != NULL)
+ return reg->target_regnum;
+ else
+ return -1;
+}
+
+/* Check whether REGNUM is a member of REGGROUP. Registers from the
+ target description may be classified as general, float, or vector.
+ Unlike a gdbarch register_reggroup_p method, this function will
+ return -1 if it does not know; the caller should handle registers
+ with no specified group.
+
+ Arbitrary strings (other than "general", "float", and "vector")
+ from the description are not used; they cause the register to be
+ displayed in "info all-registers" but excluded from "info
+ registers" et al. The names of containing features are also not
+ used. This might be extended to display registers in some more
+ useful groupings.
+
+ The save-restore flag is also implemented here. */
+
+int
+tdesc_register_in_reggroup_p (struct gdbarch *gdbarch, int regno,
+ struct reggroup *reggroup)
+{
+ struct tdesc_reg *reg = tdesc_find_register (gdbarch, regno);
+
+ if (reg != NULL && reg->group != NULL)
+ {
+ int general_p = 0, float_p = 0, vector_p = 0;
+
+ if (strcmp (reg->group, "general") == 0)
+ general_p = 1;
+ else if (strcmp (reg->group, "float") == 0)
+ float_p = 1;
+ else if (strcmp (reg->group, "vector") == 0)
+ vector_p = 1;
+
+ if (reggroup == float_reggroup)
+ return float_p;
+
+ if (reggroup == vector_reggroup)
+ return vector_p;
+
+ if (reggroup == general_reggroup)
+ return general_p;
+ }
+
+ if (reg != NULL
+ && (reggroup == save_reggroup || reggroup == restore_reggroup))
+ return reg->save_restore;
+
+ return -1;
+}
+
+/* Check whether REGNUM is a member of REGGROUP. Registers with no
+ group specified go to the default reggroup function and are handled
+ by type. */
+
+static int
+tdesc_register_reggroup_p (struct gdbarch *gdbarch, int regno,
+ struct reggroup *reggroup)
+{
+ int num_regs = gdbarch_num_regs (gdbarch);
+ int num_pseudo_regs = gdbarch_num_pseudo_regs (gdbarch);
+ int ret;
+
+ if (regno >= num_regs && regno < num_regs + num_pseudo_regs)
+ {
+ struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data);
+
+ if (data->pseudo_register_reggroup_p != NULL)
+ return data->pseudo_register_reggroup_p (gdbarch, regno, reggroup);
+ /* Otherwise fall through to the default reggroup_p. */
+ }
+
+ ret = tdesc_register_in_reggroup_p (gdbarch, regno, reggroup);
+ if (ret != -1)
+ return ret;
+
+ return default_register_reggroup_p (gdbarch, regno, reggroup);
+}
+
+/* Record architecture-specific functions to call for pseudo-register
+ support. */
+
+void
+set_tdesc_pseudo_register_name (struct gdbarch *gdbarch,
+ gdbarch_register_name_ftype *pseudo_name)
+{
+ struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data);
+
+ data->pseudo_register_name = pseudo_name;
+}
+
+void
+set_tdesc_pseudo_register_type (struct gdbarch *gdbarch,
+ gdbarch_register_type_ftype *pseudo_type)
+{
+ struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data);
+
+ data->pseudo_register_type = pseudo_type;
+}
+
+void
+set_tdesc_pseudo_register_reggroup_p
+ (struct gdbarch *gdbarch,
+ gdbarch_register_reggroup_p_ftype *pseudo_reggroup_p)
+{
+ struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data);
+
+ data->pseudo_register_reggroup_p = pseudo_reggroup_p;
+}
+
+/* Update GDBARCH to use the target description for registers. */
+
+void
+tdesc_use_registers (struct gdbarch *gdbarch,
+ const struct target_desc *target_desc,
+ 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;
+
+ /* We can't use the description for registers if it doesn't describe
+ any. This function should only be called after validating
+ registers, so the caller should know that registers are
+ included. */
+ gdb_assert (tdesc_has_registers (target_desc));
+
+ data = gdbarch_data (gdbarch, tdesc_data);
+ data->arch_regs = early_data->arch_regs;
+ xfree (early_data);
+
+ /* Build up a set of all registers, so that we can assign register
+ 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++)
+ {
+ void **slot = htab_find_slot (reg_hash, reg, INSERT);
+
+ *slot = reg;
+ }
+
+ /* Remove any registers which were assigned numbers by the
+ architecture. */
+ for (ixr = 0;
+ VEC_iterate (tdesc_arch_reg, data->arch_regs, ixr, arch_reg);
+ ixr++)
+ if (arch_reg->reg)
+ htab_remove_elt (reg_hash, arch_reg->reg);
+
+ /* Assign numbers to the remaining registers and add them to the
+ list of registers. The new numbers are always above gdbarch_num_regs.
+ Iterate over the features, not the hash table, so that the order
+ matches that in the target description. */
+
+ 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)
+ {
+ new_arch_reg.reg = reg;
+ VEC_safe_push (tdesc_arch_reg, data->arch_regs, &new_arch_reg);
+ num_regs++;
+ }
+
+ htab_delete (reg_hash);
+
+ /* Update the architecture. */
+ set_gdbarch_num_regs (gdbarch, num_regs);
+ set_gdbarch_register_name (gdbarch, tdesc_register_name);
+ set_gdbarch_register_type (gdbarch, tdesc_register_type);
+ set_gdbarch_remote_register_number (gdbarch,
+ tdesc_remote_register_number);
+ set_gdbarch_register_reggroup_p (gdbarch, tdesc_register_reggroup_p);
+}