diff options
Diffstat (limited to 'gdb/xml-tdesc.c')
| -rw-r--r-- | gdb/xml-tdesc.c | 382 |
1 files changed, 175 insertions, 207 deletions
diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c index a8b0b0566c7..c4801ea412d 100644 --- a/gdb/xml-tdesc.c +++ b/gdb/xml-tdesc.c @@ -48,14 +48,14 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher) if (!have_warned) { have_warned = 1; - warning (_("Can not parse XML target description; XML support was " - "disabled at compile time")); + warning (_ ("Can not parse XML target description; XML support was " + "disabled at compile time")); } return NULL; } -#else /* HAVE_LIBEXPAT */ +#else /* HAVE_LIBEXPAT */ /* A record of every XML description we have parsed. We never discard old descriptions, because we never discard gdbarches. As long as we @@ -93,16 +93,18 @@ struct tdesc_parsing_data static void tdesc_end_arch (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, const char *body_text) + const struct gdb_xml_element *element, void *user_data, + const char *body_text) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; const struct bfd_arch_info *arch; arch = bfd_scan_arch (body_text); if (arch == NULL) - gdb_xml_error (parser, _("Target description specified unknown " - "architecture \"%s\""), body_text); + gdb_xml_error (parser, + _ ("Target description specified unknown " + "architecture \"%s\""), + body_text); set_tdesc_architecture (data->tdesc, arch); } @@ -110,15 +112,15 @@ tdesc_end_arch (struct gdb_xml_parser *parser, static void tdesc_end_osabi (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, const char *body_text) + const struct gdb_xml_element *element, void *user_data, + const char *body_text) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; enum gdb_osabi osabi; osabi = osabi_from_tdesc_string (body_text); if (osabi == GDB_OSABI_UNKNOWN) - warning (_("Target description specified unknown osabi \"%s\""), + warning (_ ("Target description specified unknown osabi \"%s\""), body_text); else set_tdesc_osabi (data->tdesc, osabi); @@ -128,8 +130,8 @@ tdesc_end_osabi (struct gdb_xml_parser *parser, static void tdesc_end_compatible (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, const char *body_text) + const struct gdb_xml_element *element, void *user_data, + const char *body_text) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; const struct bfd_arch_info *arch; @@ -142,15 +144,15 @@ tdesc_end_compatible (struct gdb_xml_parser *parser, static void tdesc_start_target (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { char *version = (char *) xml_find_attribute (attributes, "version")->value.get (); if (strcmp (version, "1.0") != 0) gdb_xml_error (parser, - _("Target description has unsupported version \"%s\""), + _ ("Target description has unsupported version \"%s\""), version); } @@ -158,8 +160,8 @@ tdesc_start_target (struct gdb_xml_parser *parser, static void tdesc_start_feature (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; char *name = (char *) xml_find_attribute (attributes, "name")->value.get (); @@ -172,8 +174,8 @@ tdesc_start_feature (struct gdb_xml_parser *parser, static void tdesc_start_reg (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; int ix = 0; @@ -184,10 +186,10 @@ tdesc_start_reg (struct gdb_xml_parser *parser, int length = attributes.size (); name = (char *) attributes[ix++].value.get (); - bitsize = * (ULONGEST *) attributes[ix++].value.get (); + bitsize = *(ULONGEST *) attributes[ix++].value.get (); if (ix < length && strcmp (attributes[ix].name, "regnum") == 0) - regnum = * (ULONGEST *) attributes[ix++].value.get (); + regnum = *(ULONGEST *) attributes[ix++].value.get (); else regnum = data->next_regnum; @@ -202,15 +204,14 @@ tdesc_start_reg (struct gdb_xml_parser *parser, group = NULL; if (ix < length && strcmp (attributes[ix].name, "save-restore") == 0) - save_restore = * (ULONGEST *) attributes[ix++].value.get (); + save_restore = *(ULONGEST *) attributes[ix++].value.get (); else save_restore = 1; - if (strcmp (type, "int") != 0 - && strcmp (type, "float") != 0 + if (strcmp (type, "int") != 0 && strcmp (type, "float") != 0 && tdesc_named_type (data->current_feature, type) == NULL) - gdb_xml_error (parser, _("Register \"%s\" has unknown type \"%s\""), - name, type); + gdb_xml_error (parser, _ ("Register \"%s\" has unknown type \"%s\""), name, + type); tdesc_create_reg (data->current_feature, name, regnum, save_restore, group, bitsize, type); @@ -223,8 +224,8 @@ tdesc_start_reg (struct gdb_xml_parser *parser, static void tdesc_start_union (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; char *id = (char *) xml_find_attribute (attributes, "id")->value.get (); @@ -238,8 +239,8 @@ tdesc_start_union (struct gdb_xml_parser *parser, static void tdesc_start_struct (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; char *id = (char *) xml_find_attribute (attributes, "id")->value.get (); @@ -253,12 +254,12 @@ tdesc_start_struct (struct gdb_xml_parser *parser, attr = xml_find_attribute (attributes, "size"); if (attr != NULL) { - ULONGEST size = * (ULONGEST *) attr->value.get (); + ULONGEST size = *(ULONGEST *) attr->value.get (); if (size > MAX_FIELD_SIZE) { gdb_xml_error (parser, - _("Struct size %s is larger than maximum (%d)"), + _ ("Struct size %s is larger than maximum (%d)"), pulongest (size), MAX_FIELD_SIZE); } tdesc_set_struct_size (type_with_fields, size); @@ -268,18 +269,17 @@ tdesc_start_struct (struct gdb_xml_parser *parser, static void tdesc_start_flags (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; char *id = (char *) xml_find_attribute (attributes, "id")->value.get (); - ULONGEST size = * (ULONGEST *) - xml_find_attribute (attributes, "size")->value.get (); + ULONGEST size + = *(ULONGEST *) xml_find_attribute (attributes, "size")->value.get (); if (size > MAX_FIELD_SIZE) { - gdb_xml_error (parser, - _("Flags size %s is larger than maximum (%d)"), + gdb_xml_error (parser, _ ("Flags size %s is larger than maximum (%d)"), pulongest (size), MAX_FIELD_SIZE); } @@ -289,18 +289,17 @@ tdesc_start_flags (struct gdb_xml_parser *parser, static void tdesc_start_enum (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; char *id = (char *) xml_find_attribute (attributes, "id")->value.get (); - int size = * (ULONGEST *) - xml_find_attribute (attributes, "size")->value.get (); + int size + = *(ULONGEST *) xml_find_attribute (attributes, "size")->value.get (); if (size > MAX_FIELD_SIZE) { - gdb_xml_error (parser, - _("Enum size %s is larger than maximum (%d)"), + gdb_xml_error (parser, _ ("Enum size %s is larger than maximum (%d)"), pulongest (size), MAX_FIELD_SIZE); } @@ -313,8 +312,8 @@ tdesc_start_enum (struct gdb_xml_parser *parser, static void tdesc_start_field (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; struct gdb_xml_value *attr; @@ -339,12 +338,12 @@ tdesc_start_field (struct gdb_xml_parser *parser, attr = xml_find_attribute (attributes, "start"); if (attr != NULL) { - ULONGEST ul_start = * (ULONGEST *) attr->value.get (); + ULONGEST ul_start = *(ULONGEST *) attr->value.get (); if (ul_start > MAX_FIELD_BITSIZE) { gdb_xml_error (parser, - _("Field start %s is larger than maximum (%d)"), + _ ("Field start %s is larger than maximum (%d)"), pulongest (ul_start), MAX_FIELD_BITSIZE); } start = ul_start; @@ -355,12 +354,12 @@ tdesc_start_field (struct gdb_xml_parser *parser, attr = xml_find_attribute (attributes, "end"); if (attr != NULL) { - ULONGEST ul_end = * (ULONGEST *) attr->value.get (); + ULONGEST ul_end = *(ULONGEST *) attr->value.get (); if (ul_end > MAX_FIELD_BITSIZE) { gdb_xml_error (parser, - _("Field end %s is larger than maximum (%d)"), + _ ("Field end %s is larger than maximum (%d)"), pulongest (ul_end), MAX_FIELD_BITSIZE); } end = ul_end; @@ -376,34 +375,32 @@ tdesc_start_field (struct gdb_xml_parser *parser, Stick with that for now, to help ensure backward compatibility. E.g., If a newer gdbserver is talking to an older gdb. */ if (end == -1) - gdb_xml_error (parser, _("Missing end value")); + gdb_xml_error (parser, _ ("Missing end value")); if (data->current_type_size == 0) gdb_xml_error (parser, - _("Bitfields must live in explicitly sized types")); + _ ("Bitfields must live in explicitly sized types")); - if (field_type_id != NULL - && strcmp (field_type_id, "bool") == 0 + if (field_type_id != NULL && strcmp (field_type_id, "bool") == 0 && start != end) { - gdb_xml_error (parser, - _("Boolean fields must be one bit in size")); + gdb_xml_error (parser, _ ("Boolean fields must be one bit in size")); } if (end >= 64) gdb_xml_error (parser, - _("Bitfield \"%s\" goes past " - "64 bits (unsupported)"), + _ ("Bitfield \"%s\" goes past " + "64 bits (unsupported)"), field_name); /* Assume that the bit numbering in XML is "lsb-zero". Most architectures other than PowerPC use this ordering. In the future, we can add an XML tag to indicate "msb-zero" numbering. */ if (start > end) - gdb_xml_error (parser, _("Bitfield \"%s\" has start after end"), + gdb_xml_error (parser, _ ("Bitfield \"%s\" has start after end"), field_name); if (end >= data->current_type_size * TARGET_CHAR_BIT) - gdb_xml_error (parser, _("Bitfield \"%s\" does not fit in struct"), + gdb_xml_error (parser, _ ("Bitfield \"%s\" does not fit in struct"), field_name); if (field_type != NULL) @@ -414,26 +411,28 @@ tdesc_start_field (struct gdb_xml_parser *parser, tdesc_add_bitfield (t, field_name, start, end); } else if (start == -1 && end != -1) - gdb_xml_error (parser, _("End specified but not start")); + gdb_xml_error (parser, _ ("End specified but not start")); else if (field_type_id != NULL) { /* TDESC_TYPE_FLAGS values are explicitly sized, so the following test catches adding non-bitfield types to flags as well. */ if (data->current_type_size != 0) gdb_xml_error (parser, - _("Explicitly sized type cannot " - "contain non-bitfield \"%s\""), + _ ("Explicitly sized type cannot " + "contain non-bitfield \"%s\""), field_name); if (field_type == NULL) - gdb_xml_error (parser, _("Field \"%s\" references undefined " - "type \"%s\""), + gdb_xml_error (parser, + _ ("Field \"%s\" references undefined " + "type \"%s\""), field_name, field_type_id); tdesc_add_field (data->current_type, field_name, field_type); } else - gdb_xml_error (parser, _("Field \"%s\" has neither type nor bit position"), + gdb_xml_error (parser, + _ ("Field \"%s\" has neither type nor bit position"), field_name); } @@ -442,8 +441,8 @@ tdesc_start_field (struct gdb_xml_parser *parser, static void tdesc_start_enum_value (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; struct gdb_xml_value *attr; @@ -454,11 +453,10 @@ tdesc_start_enum_value (struct gdb_xml_parser *parser, field_name = (char *) xml_find_attribute (attributes, "name")->value.get (); attr = xml_find_attribute (attributes, "value"); - ul_value = * (ULONGEST *) attr->value.get (); + ul_value = *(ULONGEST *) attr->value.get (); if (ul_value > INT_MAX) { - gdb_xml_error (parser, - _("Enum value %s is larger than maximum (%d)"), + gdb_xml_error (parser, _ ("Enum value %s is larger than maximum (%d)"), pulongest (ul_value), INT_MAX); } value = ul_value; @@ -471,8 +469,8 @@ tdesc_start_enum_value (struct gdb_xml_parser *parser, static void tdesc_start_vector (struct gdb_xml_parser *parser, - const struct gdb_xml_element *element, - void *user_data, std::vector<gdb_xml_value> &attributes) + const struct gdb_xml_element *element, void *user_data, + std::vector<gdb_xml_value> &attributes) { struct tdesc_parsing_data *data = (struct tdesc_parsing_data *) user_data; struct tdesc_type *field_type; @@ -481,137 +479,116 @@ tdesc_start_vector (struct gdb_xml_parser *parser, id = (char *) attributes[0].value.get (); field_type_id = (char *) attributes[1].value.get (); - count = * (ULONGEST *) attributes[2].value.get (); + count = *(ULONGEST *) attributes[2].value.get (); if (count > MAX_VECTOR_SIZE) { - gdb_xml_error (parser, - _("Vector size %s is larger than maximum (%d)"), + gdb_xml_error (parser, _ ("Vector size %s is larger than maximum (%d)"), pulongest (count), MAX_VECTOR_SIZE); } field_type = tdesc_named_type (data->current_feature, field_type_id); if (field_type == NULL) - gdb_xml_error (parser, _("Vector \"%s\" references undefined type \"%s\""), - id, field_type_id); + gdb_xml_error (parser, + _ ("Vector \"%s\" references undefined type \"%s\""), id, + field_type_id); tdesc_create_vector (data->current_feature, id, field_type, count); } /* The elements and attributes of an XML target description. */ -static const struct gdb_xml_attribute field_attributes[] = { - { "name", GDB_XML_AF_NONE, NULL, NULL }, - { "type", GDB_XML_AF_OPTIONAL, NULL, NULL }, - { "start", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, - { "end", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute enum_value_attributes[] = { - { "name", GDB_XML_AF_NONE, NULL, NULL }, - { "value", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_element struct_union_children[] = { - { "field", field_attributes, NULL, GDB_XML_EF_REPEATABLE, - tdesc_start_field, NULL }, - { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_element enum_children[] = { - { "evalue", enum_value_attributes, NULL, GDB_XML_EF_REPEATABLE, - tdesc_start_enum_value, NULL }, - { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute reg_attributes[] = { - { "name", GDB_XML_AF_NONE, NULL, NULL }, - { "bitsize", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, - { "regnum", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, - { "type", GDB_XML_AF_OPTIONAL, NULL, NULL }, - { "group", GDB_XML_AF_OPTIONAL, NULL, NULL }, - { "save-restore", GDB_XML_AF_OPTIONAL, - gdb_xml_parse_attr_enum, gdb_xml_enums_boolean }, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute struct_union_attributes[] = { - { "id", GDB_XML_AF_NONE, NULL, NULL }, - { "size", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL}, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute flags_attributes[] = { - { "id", GDB_XML_AF_NONE, NULL, NULL }, - { "size", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL}, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute enum_attributes[] = { - { "id", GDB_XML_AF_NONE, NULL, NULL }, - { "size", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL}, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute vector_attributes[] = { - { "id", GDB_XML_AF_NONE, NULL, NULL }, - { "type", GDB_XML_AF_NONE, NULL, NULL }, - { "count", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; - -static const struct gdb_xml_attribute feature_attributes[] = { - { "name", GDB_XML_AF_NONE, NULL, NULL }, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; +static const struct gdb_xml_attribute field_attributes[] + = { { "name", GDB_XML_AF_NONE, NULL, NULL }, + { "type", GDB_XML_AF_OPTIONAL, NULL, NULL }, + { "start", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, + { "end", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute enum_value_attributes[] + = { { "name", GDB_XML_AF_NONE, NULL, NULL }, + { "value", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_element struct_union_children[] + = { { "field", field_attributes, NULL, GDB_XML_EF_REPEATABLE, + tdesc_start_field, NULL }, + { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; + +static const struct gdb_xml_element enum_children[] + = { { "evalue", enum_value_attributes, NULL, GDB_XML_EF_REPEATABLE, + tdesc_start_enum_value, NULL }, + { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute reg_attributes[] + = { { "name", GDB_XML_AF_NONE, NULL, NULL }, + { "bitsize", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { "regnum", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, + { "type", GDB_XML_AF_OPTIONAL, NULL, NULL }, + { "group", GDB_XML_AF_OPTIONAL, NULL, NULL }, + { "save-restore", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_enum, + gdb_xml_enums_boolean }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute struct_union_attributes[] + = { { "id", GDB_XML_AF_NONE, NULL, NULL }, + { "size", GDB_XML_AF_OPTIONAL, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute flags_attributes[] + = { { "id", GDB_XML_AF_NONE, NULL, NULL }, + { "size", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute enum_attributes[] + = { { "id", GDB_XML_AF_NONE, NULL, NULL }, + { "size", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute vector_attributes[] + = { { "id", GDB_XML_AF_NONE, NULL, NULL }, + { "type", GDB_XML_AF_NONE, NULL, NULL }, + { "count", GDB_XML_AF_NONE, gdb_xml_parse_attr_ulongest, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; + +static const struct gdb_xml_attribute feature_attributes[] + = { { "name", GDB_XML_AF_NONE, NULL, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; static const struct gdb_xml_element feature_children[] = { - { "reg", reg_attributes, NULL, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, + { "reg", reg_attributes, NULL, GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_reg, NULL }, { "struct", struct_union_attributes, struct_union_children, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, - tdesc_start_struct, NULL }, + GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_struct, NULL }, { "union", struct_union_attributes, struct_union_children, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, - tdesc_start_union, NULL }, + GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_union, NULL }, { "flags", flags_attributes, struct_union_children, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, - tdesc_start_flags, NULL }, + GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_flags, NULL }, { "enum", enum_attributes, enum_children, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, - tdesc_start_enum, NULL }, + GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_enum, NULL }, { "vector", vector_attributes, NULL, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, - tdesc_start_vector, NULL }, + GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_vector, NULL }, { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; -static const struct gdb_xml_attribute target_attributes[] = { - { "version", GDB_XML_AF_NONE, NULL, NULL }, - { NULL, GDB_XML_AF_NONE, NULL, NULL } -}; +static const struct gdb_xml_attribute target_attributes[] + = { { "version", GDB_XML_AF_NONE, NULL, NULL }, + { NULL, GDB_XML_AF_NONE, NULL, NULL } }; static const struct gdb_xml_element target_children[] = { - { "architecture", NULL, NULL, GDB_XML_EF_OPTIONAL, - NULL, tdesc_end_arch }, - { "osabi", NULL, NULL, GDB_XML_EF_OPTIONAL, - NULL, tdesc_end_osabi }, + { "architecture", NULL, NULL, GDB_XML_EF_OPTIONAL, NULL, tdesc_end_arch }, + { "osabi", NULL, NULL, GDB_XML_EF_OPTIONAL, NULL, tdesc_end_osabi }, { "compatible", NULL, NULL, GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, NULL, tdesc_end_compatible }, { "feature", feature_attributes, feature_children, - GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, - tdesc_start_feature, NULL }, + GDB_XML_EF_OPTIONAL | GDB_XML_EF_REPEATABLE, tdesc_start_feature, NULL }, { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; -static const struct gdb_xml_element tdesc_elements[] = { - { "target", target_attributes, target_children, GDB_XML_EF_NONE, - tdesc_start_target, NULL }, - { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } -}; +static const struct gdb_xml_element tdesc_elements[] + = { { "target", target_attributes, target_children, GDB_XML_EF_NONE, + tdesc_start_target, NULL }, + { NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL } }; /* Parse DOCUMENT into a target description and return it. */ @@ -623,11 +600,10 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher) /* Expand all XInclude directives. */ std::string expanded_text; - if (!xml_process_xincludes (expanded_text, - _("target description"), + if (!xml_process_xincludes (expanded_text, _ ("target description"), document, fetcher, 0)) { - warning (_("Could not load XML target description; ignoring")); + warning (_ ("Could not load XML target description; ignoring")); return NULL; } @@ -641,8 +617,9 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher) target_desc_up description = allocate_target_description (); data.tdesc = description.get (); - if (gdb_xml_parse_quick (_("target description"), "gdb-target.dtd", - tdesc_elements, expanded_text.c_str (), &data) == 0) + if (gdb_xml_parse_quick (_ ("target description"), "gdb-target.dtd", + tdesc_elements, expanded_text.c_str (), &data) + == 0) { /* Parsed successfully. */ xml_cache.emplace (std::move (expanded_text), std::move (description)); @@ -650,12 +627,11 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher) } else { - warning (_("Could not load XML target description; ignoring")); + warning (_ ("Could not load XML target description; ignoring")); return NULL; } } #endif /* HAVE_LIBEXPAT */ - /* Read an XML target description from FILENAME. Parse it, and return the parsed description. */ @@ -667,15 +643,14 @@ file_read_description_xml (const char *filename) = xml_fetch_content_from_file (filename, NULL); if (!tdesc_str) { - warning (_("Could not open \"%s\""), filename); + warning (_ ("Could not open \"%s\""), filename); return NULL; } const std::string dirname = ldirname (filename); - auto fetch_another = [&dirname] (const char *name) - { - return xml_fetch_content_from_file (name, dirname.c_str ()); - }; + auto fetch_another = [&dirname] (const char *name) { + return xml_fetch_content_from_file (name, dirname.c_str ()); + }; return tdesc_parse_xml (tdesc_str->data (), fetch_another); } @@ -692,11 +667,8 @@ fetch_available_features_from_target (const char *name, target_ops *ops) { /* Read this object as a string. This ensures that a NUL terminator is added. */ - return target_read_stralloc (ops, - TARGET_OBJECT_AVAILABLE_FEATURES, - name); + return target_read_stralloc (ops, TARGET_OBJECT_AVAILABLE_FEATURES, name); } - /* Read an XML target description using OPS. Parse it, and return the parsed description. */ @@ -709,10 +681,9 @@ target_read_description_xml (struct target_ops *ops) if (!tdesc_str) return NULL; - auto fetch_another = [ops] (const char *name) - { - return fetch_available_features_from_target (name, ops); - }; + auto fetch_another = [ops] (const char *name) { + return fetch_available_features_from_target (name, ops); + }; return tdesc_parse_xml (tdesc_str->data (), fetch_another); } @@ -730,27 +701,25 @@ target_fetch_description_xml (struct target_ops *ops) if (!have_warned) { have_warned = 1; - warning (_("Can not fetch XML target description; XML support was " - "disabled at compile time")); + warning (_ ("Can not fetch XML target description; XML support was " + "disabled at compile time")); } return {}; #else - gdb::optional<gdb::char_vector> - tdesc_str = fetch_available_features_from_target ("target.xml", ops); + gdb::optional<gdb::char_vector> tdesc_str + = fetch_available_features_from_target ("target.xml", ops); if (!tdesc_str) return {}; - auto fetch_another = [ops] (const char *name) - { - return fetch_available_features_from_target (name, ops); - }; + auto fetch_another = [ops] (const char *name) { + return fetch_available_features_from_target (name, ops); + }; std::string output; - if (!xml_process_xincludes (output, - _("target description"), + if (!xml_process_xincludes (output, _ ("target description"), tdesc_str->data (), fetch_another, 0)) { - warning (_("Could not load XML target description; ignoring")); + warning (_ ("Could not load XML target description; ignoring")); return {}; } return output; @@ -762,9 +731,8 @@ target_fetch_description_xml (struct target_ops *ops) const struct target_desc * string_read_description_xml (const char *xml) { - return tdesc_parse_xml (xml, [] (const char *href) - { - error (_("xincludes are unsupported with this method")); - return gdb::optional<gdb::char_vector> (); - }); + return tdesc_parse_xml (xml, [] (const char *href) { + error (_ ("xincludes are unsupported with this method")); + return gdb::optional<gdb::char_vector> (); + }); } |