X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftarget-descriptions.c;h=de365c9c6537e390fccb09ec62e8ebf60786fe16;hb=d2de23ad3916c9d6f6102688fdbd5fdc73053c43;hp=86adc9d6beeb459057bca87a04390a53ebfd5dd6;hpb=a6f5ef51d7c85bd0b950fd182284f6cbff5fecf0;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 86adc9d6be..de365c9c65 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -1,6 +1,6 @@ /* Target description support for GDB. - Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2006-2015 Free Software Foundation, Inc. Contributed by CodeSourcery. @@ -31,9 +31,9 @@ #include "xml-tdesc.h" #include "osabi.h" -#include "gdb_assert.h" #include "gdb_obstack.h" #include "hashtab.h" +#include "inferior.h" /* Types. */ @@ -101,38 +101,40 @@ typedef struct tdesc_type_flag } tdesc_type_flag; DEF_VEC_O(tdesc_type_flag); +enum tdesc_type_kind +{ + /* Predefined types. */ + 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 +}; + typedef struct tdesc_type { /* The name of this type. */ char *name; /* Identify the kind of this type. */ - enum - { - /* Predefined types. */ - 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 - } kind; + enum tdesc_type_kind kind; /* Kind-specific data. */ union @@ -231,34 +233,92 @@ struct tdesc_arch_data gdbarch_register_reggroup_p_ftype *pseudo_register_reggroup_p; }; -/* Global state. These variables are associated with the current - target; if GDB adds support for multiple simultaneous targets, then - these variables should become target-specific data. */ +/* Info about an inferior's target description. There's one of these + for each inferior. */ -/* A flag indicating that a description has already been fetched from - the current target, so it should not be queried again. */ +struct target_desc_info +{ + /* A flag indicating that a description has already been fetched + from the target, so it should not be queried again. */ -static int target_desc_fetched; + int fetched; -/* The description fetched from the current target, or NULL if the - current target did not supply any description. Only valid when - target_desc_fetched is set. Only the description initialization - code should access this; normally, the description should be - accessed through the gdbarch object. */ + /* The description fetched from the target, or NULL if the target + did not supply any description. Only valid when + target_desc_fetched is set. Only the description initialization + code should access this; normally, the description should be + accessed through the gdbarch object. */ -static const struct target_desc *current_target_desc; + const struct target_desc *tdesc; -/* Other global variables. */ + /* The filename to read a target description from, as set by "set + tdesc filename ..." */ -/* The filename to read a target description from. */ + char *filename; +}; -static char *target_description_filename; +/* Get the inferior INF's target description info, allocating one on + the stop if necessary. */ + +static struct target_desc_info * +get_tdesc_info (struct inferior *inf) +{ + if (inf->tdesc_info == NULL) + inf->tdesc_info = XCNEW (struct target_desc_info); + return inf->tdesc_info; +} /* A handle for architecture-specific data associated with the target description (see struct tdesc_arch_data). */ static struct gdbarch_data *tdesc_data; +/* See target-descriptions.h. */ + +int +target_desc_info_from_user_p (struct target_desc_info *info) +{ + return info != NULL && info->filename != NULL; +} + +/* See target-descriptions.h. */ + +void +copy_inferior_target_desc_info (struct inferior *destinf, struct inferior *srcinf) +{ + struct target_desc_info *src = get_tdesc_info (srcinf); + struct target_desc_info *dest = get_tdesc_info (destinf); + + dest->fetched = src->fetched; + dest->tdesc = src->tdesc; + dest->filename = src->filename != NULL ? xstrdup (src->filename) : NULL; +} + +/* See target-descriptions.h. */ + +void +target_desc_info_free (struct target_desc_info *tdesc_info) +{ + if (tdesc_info != NULL) + { + xfree (tdesc_info->filename); + xfree (tdesc_info); + } +} + +/* Convenience helper macros. */ + +#define target_desc_fetched \ + get_tdesc_info (current_inferior ())->fetched +#define current_target_desc \ + get_tdesc_info (current_inferior ())->tdesc +#define target_description_filename \ + get_tdesc_info (current_inferior ())->filename + +/* The string manipulated by the "set tdesc filename ..." command. */ + +static char *tdesc_filename_cmd_string; + /* Fetch the current target's description, and switch the current architecture to one which incorporates that description. */ @@ -275,7 +335,7 @@ target_find_description (void) /* The current architecture should not have any target description specified. It should have been cleared, e.g. when we disconnected from the previous target. */ - gdb_assert (gdbarch_target_desc (target_gdbarch) == NULL); + gdb_assert (gdbarch_target_desc (target_gdbarch ()) == NULL); /* First try to fetch an XML description from the user-specified file. */ @@ -308,7 +368,8 @@ target_find_description (void) { struct tdesc_arch_data *data; - data = gdbarch_data (target_gdbarch, tdesc_data); + data = ((struct tdesc_arch_data *) + gdbarch_data (target_gdbarch (), tdesc_data)); if (tdesc_has_registers (current_target_desc) && data->arch_regs == NULL) warning (_("Target-supplied registers are not supported " @@ -515,7 +576,7 @@ tdesc_find_type (struct gdbarch *gdbarch, const char *id) struct tdesc_arch_data *data; int i, num_regs; - data = gdbarch_data (gdbarch, tdesc_data); + data = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); num_regs = VEC_length (tdesc_arch_reg, data->arch_regs); for (i = 0; i < num_regs; i++) { @@ -657,9 +718,9 @@ tdesc_gdb_type (struct gdbarch *gdbarch, struct tdesc_type *tdesc_type) bitsize = f->end - f->start + 1; total_size = tdesc_type->u.u.size * TARGET_CHAR_BIT; if (gdbarch_bits_big_endian (gdbarch)) - FIELD_BITPOS (fld[0]) = total_size - f->start - bitsize; + SET_FIELD_BITPOS (fld[0], total_size - f->start - bitsize); else - FIELD_BITPOS (fld[0]) = f->start; + SET_FIELD_BITPOS (fld[0], f->start); FIELD_BITSIZE (fld[0]) = bitsize; } else @@ -702,11 +763,10 @@ tdesc_gdb_type (struct gdbarch *gdbarch, struct tdesc_type *tdesc_type) case TDESC_TYPE_FLAGS: { - struct type *type, *field_type; struct tdesc_type_flag *f; int ix; - type = arch_flags_type (gdbarch, xstrdup (tdesc_type->name), + 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); @@ -746,7 +806,7 @@ tdesc_data_init (struct obstack *obstack) struct tdesc_arch_data * tdesc_data_alloc (void) { - return XZALLOC (struct tdesc_arch_data); + return XCNEW (struct tdesc_arch_data); } /* Free something allocated by tdesc_data_alloc, if it is not going @@ -756,7 +816,7 @@ tdesc_data_alloc (void) void tdesc_data_cleanup (void *data_untyped) { - struct tdesc_arch_data *data = data_untyped; + struct tdesc_arch_data *data = (struct tdesc_arch_data *) data_untyped; VEC_free (tdesc_arch_reg, data->arch_regs); xfree (data); @@ -852,10 +912,9 @@ tdesc_register_size (const struct tdesc_feature *feature, static struct tdesc_arch_reg * tdesc_find_arch_register (struct gdbarch *gdbarch, int regno) { - struct tdesc_arch_reg *reg; struct tdesc_arch_data *data; - data = gdbarch_data (gdbarch, tdesc_data); + data = (struct tdesc_arch_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 @@ -866,6 +925,7 @@ 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; } @@ -884,7 +944,9 @@ tdesc_register_name (struct gdbarch *gdbarch, int regno) if (regno >= num_regs && regno < num_regs + num_pseudo_regs) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); + gdb_assert (data->pseudo_register_name != NULL); return data->pseudo_register_name (gdbarch, regno); } @@ -902,7 +964,9 @@ tdesc_register_type (struct gdbarch *gdbarch, int regno) if (reg == NULL && regno >= num_regs && regno < num_regs + num_pseudo_regs) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); + gdb_assert (data->pseudo_register_type != NULL); return data->pseudo_register_type (gdbarch, regno); } @@ -946,7 +1010,7 @@ tdesc_register_type (struct gdbarch *gdbarch, int regno) 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... */ + /* A bit desperate by this point... */ arch_reg->type = builtin_type (gdbarch)->builtin_data_ptr; else { @@ -1039,7 +1103,9 @@ tdesc_register_reggroup_p (struct gdbarch *gdbarch, int regno, if (regno >= num_regs && regno < num_regs + num_pseudo_regs) { - struct tdesc_arch_data *data = gdbarch_data (gdbarch, tdesc_data); + struct tdesc_arch_data *data + = (struct tdesc_arch_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. */ @@ -1059,7 +1125,8 @@ 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); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->pseudo_register_name = pseudo_name; } @@ -1068,7 +1135,8 @@ 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); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->pseudo_register_type = pseudo_type; } @@ -1078,7 +1146,8 @@ 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); + struct tdesc_arch_data *data + = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->pseudo_register_reggroup_p = pseudo_reggroup_p; } @@ -1091,7 +1160,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, struct tdesc_arch_data *early_data) { int num_regs = gdbarch_num_regs (gdbarch); - int i, ixf, ixr; + int ixf, ixr; struct tdesc_feature *feature; struct tdesc_reg *reg; struct tdesc_arch_data *data; @@ -1104,7 +1173,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, included. */ gdb_assert (tdesc_has_registers (target_desc)); - data = gdbarch_data (gdbarch, tdesc_data); + data = (struct tdesc_arch_data *) gdbarch_data (gdbarch, tdesc_data); data->arch_regs = early_data->arch_regs; xfree (early_data); @@ -1181,7 +1250,7 @@ tdesc_create_reg (struct tdesc_feature *feature, const char *name, int regnum, int save_restore, const char *group, int bitsize, const char *type) { - struct tdesc_reg *reg = XZALLOC (struct tdesc_reg); + struct tdesc_reg *reg = XCNEW (struct tdesc_reg); reg->name = xstrdup (name); reg->target_regnum = regnum; @@ -1200,7 +1269,6 @@ tdesc_create_reg (struct tdesc_feature *feature, const char *name, static void tdesc_free_type (struct tdesc_type *type) { - switch (type->kind) { case TDESC_TYPE_STRUCT: @@ -1244,7 +1312,7 @@ struct tdesc_type * tdesc_create_vector (struct tdesc_feature *feature, const char *name, struct tdesc_type *field_type, int count) { - struct tdesc_type *type = XZALLOC (struct tdesc_type); + struct tdesc_type *type = XCNEW (struct tdesc_type); type->name = xstrdup (name); type->kind = TDESC_TYPE_VECTOR; @@ -1258,7 +1326,7 @@ tdesc_create_vector (struct tdesc_feature *feature, const char *name, struct tdesc_type * tdesc_create_struct (struct tdesc_feature *feature, const char *name) { - struct tdesc_type *type = XZALLOC (struct tdesc_type); + struct tdesc_type *type = XCNEW (struct tdesc_type); type->name = xstrdup (name); type->kind = TDESC_TYPE_STRUCT; @@ -1281,7 +1349,7 @@ tdesc_set_struct_size (struct tdesc_type *type, LONGEST size) struct tdesc_type * tdesc_create_union (struct tdesc_feature *feature, const char *name) { - struct tdesc_type *type = XZALLOC (struct tdesc_type); + struct tdesc_type *type = XCNEW (struct tdesc_type); type->name = xstrdup (name); type->kind = TDESC_TYPE_UNION; @@ -1294,7 +1362,7 @@ struct tdesc_type * tdesc_create_flags (struct tdesc_feature *feature, const char *name, LONGEST size) { - struct tdesc_type *type = XZALLOC (struct tdesc_type); + struct tdesc_type *type = XCNEW (struct tdesc_type); type->name = xstrdup (name); type->kind = TDESC_TYPE_FLAGS; @@ -1376,7 +1444,7 @@ tdesc_free_feature (struct tdesc_feature *feature) struct tdesc_feature * tdesc_create_feature (struct target_desc *tdesc, const char *name) { - struct tdesc_feature *new_feature = XZALLOC (struct tdesc_feature); + struct tdesc_feature *new_feature = XCNEW (struct tdesc_feature); new_feature->name = xstrdup (name); @@ -1387,13 +1455,13 @@ tdesc_create_feature (struct target_desc *tdesc, const char *name) struct target_desc * allocate_target_description (void) { - return XZALLOC (struct target_desc); + return XCNEW (struct target_desc); } static void free_target_description (void *arg) { - struct target_desc *target_desc = arg; + struct target_desc *target_desc = (struct target_desc *) arg; struct tdesc_feature *feature; struct property *prop; int ix; @@ -1490,7 +1558,7 @@ static struct cmd_list_element *tdesc_unset_cmdlist; static void set_tdesc_cmd (char *args, int from_tty) { - help_list (tdesc_set_cmdlist, "set tdesc ", -1, gdb_stdout); + help_list (tdesc_set_cmdlist, "set tdesc ", all_commands, gdb_stdout); } static void @@ -1502,13 +1570,16 @@ show_tdesc_cmd (char *args, int from_tty) static void unset_tdesc_cmd (char *args, int from_tty) { - help_list (tdesc_unset_cmdlist, "unset tdesc ", -1, gdb_stdout); + help_list (tdesc_unset_cmdlist, "unset tdesc ", all_commands, gdb_stdout); } static void set_tdesc_filename_cmd (char *args, int from_tty, struct cmd_list_element *c) { + xfree (target_description_filename); + target_description_filename = xstrdup (tdesc_filename_cmd_string); + target_clear_description (); target_find_description (); } @@ -1518,13 +1589,14 @@ show_tdesc_filename_cmd (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { + value = target_description_filename; + if (value != NULL && *value != '\0') - printf_filtered (_("\ -The target description will be read from \"%s\".\n"), + printf_filtered (_("The target description will be read from \"%s\".\n"), value); else - printf_filtered (_("\ -The target description will be read from the target.\n")); + printf_filtered (_("The target description will be " + "read from the target.\n")); } static void @@ -1550,6 +1622,7 @@ maint_print_c_tdesc_cmd (char *args, int from_tty) struct tdesc_type_field *f; struct tdesc_type_flag *flag; int ix, ix2, ix3; + int printed_field_type = 0; /* Use the global target-supplied description, not the current architecture's. This lets a GDB for one architecture generate C @@ -1563,7 +1636,7 @@ maint_print_c_tdesc_cmd (char *args, int from_tty) error (_("The current target description did not come from an XML file.")); filename = lbasename (target_description_filename); - function = alloca (strlen (filename) + 1); + function = (char *) alloca (strlen (filename) + 1); for (inp = filename, outp = function; *inp != '\0'; inp++) if (*inp == '.') break; @@ -1574,8 +1647,10 @@ maint_print_c_tdesc_cmd (char *args, int from_tty) *outp = '\0'; /* Standard boilerplate. */ - printf_unfiltered ("/* THIS FILE IS GENERATED. Original: %s */\n\n", - filename); + printf_unfiltered ("/* THIS FILE IS GENERATED. " + "-*- buffer-read-only: t -*- vi" + ":set ro:\n"); + printf_unfiltered (" Original: %s */\n\n", filename); printf_unfiltered ("#include \"defs.h\"\n"); printf_unfiltered ("#include \"osabi.h\"\n"); printf_unfiltered ("#include \"target-descriptions.h\"\n"); @@ -1588,7 +1663,40 @@ maint_print_c_tdesc_cmd (char *args, int from_tty) printf_unfiltered (" struct target_desc *result = allocate_target_description ();\n"); printf_unfiltered (" struct tdesc_feature *feature;\n"); - printf_unfiltered (" struct tdesc_type *field_type, *type;\n"); + + /* Now we do some "filtering" in order to know which variables to + declare. This is needed because otherwise we would declare unused + variables `field_type' and `type'. */ + for (ix = 0; + VEC_iterate (tdesc_feature_p, tdesc->features, ix, feature); + ix++) + { + int printed_desc_type = 0; + + for (ix2 = 0; + VEC_iterate (tdesc_type_p, feature->types, ix2, type); + ix2++) + { + if (!printed_field_type) + { + printf_unfiltered (" struct tdesc_type *field_type;\n"); + printed_field_type = 1; + } + + if ((type->kind == TDESC_TYPE_UNION + || type->kind == TDESC_TYPE_STRUCT) + && VEC_length (tdesc_type_field, type->u.u.fields) > 0) + { + printf_unfiltered (" struct tdesc_type *type;\n"); + printed_desc_type = 1; + break; + } + } + + if (printed_desc_type) + break; + } + printf_unfiltered ("\n"); if (tdesc_architecture (tdesc) != NULL) @@ -1629,7 +1737,8 @@ maint_print_c_tdesc_cmd (char *args, int from_tty) VEC_iterate (tdesc_feature_p, tdesc->features, ix, feature); ix++) { - printf_unfiltered (" feature = tdesc_create_feature (result, \"%s\");\n", + printf_unfiltered (" \ +feature = tdesc_create_feature (result, \"%s\");\n", feature->name); for (ix2 = 0; @@ -1646,6 +1755,36 @@ maint_print_c_tdesc_cmd (char *args, int from_tty) (" tdesc_create_vector (feature, \"%s\", field_type, %d);\n", type->name, type->u.v.count); break; + case TDESC_TYPE_STRUCT: + printf_unfiltered + (" type = tdesc_create_struct (feature, \"%s\");\n", + type->name); + if (type->u.u.size != 0) + printf_unfiltered + (" tdesc_set_struct_size (type, %s);\n", + plongest (type->u.u.size)); + for (ix3 = 0; + VEC_iterate (tdesc_type_field, type->u.u.fields, ix3, f); + ix3++) + { + /* Going first for implicitly sized types, else part handles + bitfields. As reported on xml-tdesc.c implicitly sized types + cannot contain a bitfield. */ + if (f->type != NULL) + { + printf_unfiltered + (" field_type = tdesc_named_type (feature, \"%s\");\n", + f->type->name); + printf_unfiltered + (" tdesc_add_field (type, \"%s\", field_type);\n", + f->name); + } + else + printf_unfiltered + (" tdesc_add_bitfield (type, \"%s\", %d, %d);\n", + f->name, f->start, f->end); + } + break; case TDESC_TYPE_UNION: printf_unfiltered (" type = tdesc_create_union (feature, \"%s\");\n", @@ -1722,7 +1861,7 @@ Unset target description specific variables."), 0 /* allow-unknown */, &unsetlist); add_setshow_filename_cmd ("filename", class_obscure, - &target_description_filename, + &tdesc_filename_cmd_string, _("\ Set the file to read for an XML target description"), _("\ Show the file to read for an XML target description"), _("\