This patch adds a print_xml_feature visitor class which turns a C
target description into xml. Both gdb and gdbserver can do this.
An accept function is added to gdbserver tdesc to allow it to use
vistor classes.
Tests are added to maintenance_check_xml_descriptions which takes
each pair of tested descriptions, turns them both into xml, then back
again, and confirms the descriptions still match.
Alan.
2018-02-26 Alan Hayward <alan.hayward@arm.com>
gdb/
* common/tdesc.c (print_xml_feature::visit_post): Add xml parsing.
(print_xml_feature::visit_pre): Likewise.
(print_xml_feature::visit_post): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::visit): Likewise.
(print_xml_feature::visit): Likewise.
* common/tdesc.h (print_xml_feature): Add new class.
* regformats/regdat.sh: obtain xml.
* target-descriptions.c (struct target_desc): Add xmltarget.
(print_xml_feature::visit_pre): Add xml vistor.
(tdesc_get_features_xml): Add function to get xml.
(maintenance_check_xml_descriptions): Test xml generation.
* xml-tdesc.c (target_read_description_xml_string): Add function.
* xml-tdesc.h (target_read_description_xml_string): Add declaration.
gdbserver/
* tdesc.c (void target_desc::accept): Fill in function.
(tdesc_get_features_xml): Remove old xml creation.
(print_xml_feature::visit_pre): Add xml vistor.
type->fields.emplace_back (name,
tdesc_predefined_type (TDESC_TYPE_INT32),
value, -1);
-}
\ No newline at end of file
+}
+
+void print_xml_feature::visit_post (const target_desc *e)
+{
+ *m_buffer += "</target>\n";
+}
+
+void print_xml_feature::visit_pre (const tdesc_feature *e)
+{
+ *m_buffer += "<feature name=\"";
+ *m_buffer += e->name;
+ *m_buffer += "\">\n";
+}
+
+void print_xml_feature::visit_post (const tdesc_feature *e)
+{
+ *m_buffer += "</feature>\n";
+}
+
+void print_xml_feature::visit (const tdesc_type_builtin *type)
+{
+ error (_("xml output is not supported type \"%s\"."), type->name.c_str ());
+}
+
+void print_xml_feature::visit (const tdesc_type_vector *type)
+{
+ *m_buffer += "<vector id=\"";
+ *m_buffer += type->name;
+ *m_buffer += "\" type=\"";
+ *m_buffer += type->element_type->name;
+ *m_buffer += "\" count=\"";
+ *m_buffer += std::to_string (type->count);
+ *m_buffer += "\"/>\n";
+}
+
+void print_xml_feature::visit (const tdesc_type_with_fields *type)
+{
+ struct tdesc_type_field *f;
+ const static char *types[] = { "struct", "union", "flags", "enum" };
+
+ gdb_assert (type->kind >= TDESC_TYPE_STRUCT && type->kind <= TDESC_TYPE_ENUM);
+ *m_buffer += "<";
+ *m_buffer += types[type->kind - TDESC_TYPE_STRUCT];
+
+ switch (type->kind)
+ {
+ case TDESC_TYPE_STRUCT:
+ case TDESC_TYPE_FLAGS:
+ *m_buffer += " id=\"";
+ *m_buffer += type->name;
+ if (type->size > 0)
+ {
+ *m_buffer += "\" size=\"";
+ *m_buffer += std::to_string (type->size);
+ }
+ *m_buffer += "\">\n";
+
+ for (const tdesc_type_field &f : type->fields)
+ {
+ *m_buffer += " <field name=\"";
+ *m_buffer += f.name;
+ if (f.start == -1)
+ {
+ *m_buffer += "\" type=\"";
+ *m_buffer += f.type->name;
+ }
+ else
+ {
+ *m_buffer += "\" start=\"";
+ *m_buffer += std::to_string (f.start);
+ *m_buffer += "\" end=\"";
+ *m_buffer += std::to_string (f.end);
+ }
+
+ *m_buffer += "\"/>\n";
+ }
+ break;
+
+ case TDESC_TYPE_ENUM:
+ *m_buffer += " id=\"";
+ *m_buffer += type->name;
+ *m_buffer += "\">\n";
+
+ for (const tdesc_type_field &f : type->fields)
+ {
+ *m_buffer += " <field name=\"";
+ *m_buffer += f.name;
+ *m_buffer += "\" start=\"";
+ *m_buffer += std::to_string (f.start);
+ *m_buffer += "\"/>\n";
+ }
+ break;
+
+ case TDESC_TYPE_UNION:
+ *m_buffer += " id=\"";
+ *m_buffer += type->name;
+ *m_buffer += "\">\n";
+
+ for (const tdesc_type_field &f : type->fields)
+ {
+ *m_buffer += " <field name=\"";
+ *m_buffer += f.name;
+ *m_buffer += "\" type=\"";
+ *m_buffer += f.type->name;
+ *m_buffer += "\"/>\n";
+ }
+ break;
+
+ default:
+ error (_("xml output is not supported type \"%s\"."),
+ type->name.c_str ());
+ }
+
+ *m_buffer += "</";
+ *m_buffer += types[type->kind - TDESC_TYPE_STRUCT];
+ *m_buffer += ">\n";
+}
+
+void print_xml_feature::visit (const tdesc_reg *reg)
+{
+ *m_buffer += "<reg name=\"";
+ *m_buffer += reg->name;
+ *m_buffer += "\" bitsize=\"";
+ *m_buffer += std::to_string (reg->bitsize);
+ *m_buffer += "\" type=\"";
+ *m_buffer += reg->type;
+ *m_buffer += "\" regnum=\"";
+ *m_buffer += std::to_string (reg->target_regnum);
+ if (reg->group.length () > 0)
+ {
+ *m_buffer += "\" group=\"";
+ *m_buffer += reg->group;
+ }
+ *m_buffer += "\"/>\n";
+}
+
+void print_xml_feature::visit_pre (const target_desc *e)
+{
+#ifndef IN_PROCESS_AGENT
+ *m_buffer += "<?xml version=\"1.0\"?>\n";
+ *m_buffer += "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">\n";
+ *m_buffer += "<target>\n";
+ *m_buffer += "<architecture>";
+ *m_buffer += tdesc_architecture_name (e);
+ *m_buffer += "</architecture>\n";
+
+ const char *osabi = tdesc_osabi_name (e);
+ if (osabi != nullptr)
+ {
+ *m_buffer += "<osabi>";
+ *m_buffer += osabi;
+ *m_buffer += "</osabi>\n";
+ }
+#endif
+}
int regnum, int save_restore, const char *group,
int bitsize, const char *type);
+/* Return the tdesc in string XML format. */
+
+const char *tdesc_get_features_xml (target_desc *tdesc);
+
+/* Print target description as xml. */
+
+class print_xml_feature : public tdesc_element_visitor
+{
+public:
+ print_xml_feature (std::string *buffer_)
+ : m_buffer (buffer_)
+ {}
+
+ ~print_xml_feature ()
+ {}
+
+ void visit_pre (const target_desc *e) override;
+ void visit_post (const target_desc *e) override;
+ void visit_pre (const tdesc_feature *e) override;
+ void visit_post (const tdesc_feature *e) override;
+ void visit (const tdesc_type_builtin *type) override;
+ void visit (const tdesc_type_vector *type) override;
+ void visit (const tdesc_type_with_fields *type) override;
+ void visit (const tdesc_reg *reg) override;
+
+private:
+ std::string *m_buffer;
+};
+
#endif /* ARCH_TDESC_H */
#endif
+void target_desc::accept (tdesc_element_visitor &v) const
+{
+#ifndef IN_PROCESS_AGENT
+ v.visit_pre (this);
+
+ for (const tdesc_feature_up &feature : features)
+ feature->accept (v);
+
+ v.visit_post (this);
+#endif
+}
+
void
init_target_desc (struct target_desc *tdesc)
{
target_desc->osabi = xstrdup (name);
}
-/* Return a string which is of XML format, including XML target
- description to be sent to GDB. */
+/* See common/tdesc.h. */
const char *
tdesc_get_features_xml (target_desc *tdesc)
if (tdesc->xmltarget == NULL)
{
- std::string buffer ("@<?xml version=\"1.0\"?>");
-
- buffer += "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">";
- buffer += "<target>";
- buffer += "<architecture>";
- buffer += tdesc_architecture_name (tdesc);
- buffer += "</architecture>";
-
- const char *osabi = tdesc_osabi_name (tdesc);
- if (osabi != nullptr)
- {
- buffer += "<osabi>";
- buffer += osabi;
- buffer += "</osabi>";
- }
-
- for (const tdesc_feature_up &feature : tdesc->features)
- {
- buffer += "<xi:include href=\"";
- buffer += feature->name;
- buffer += "\"/>";
- }
-
- buffer += "</target>";
-
+ std::string buffer ("@");
+ print_xml_feature v (&buffer);
+ tdesc->accept (v);
tdesc->xmltarget = xstrdup (buffer.c_str ());
}
/* A target description. Inherit from tdesc_feature so that target_desc
can be used as tdesc_feature. */
-struct target_desc
+struct target_desc : tdesc_element
{
/* A vector of elements of register definitions that
describe the inferior's register set. */
return !(*this == other);
}
#endif
+
+ void accept (tdesc_element_visitor &v) const;
};
/* Copy target description SRC to DEST. */
cat <<EOF
#ifndef IN_PROCESS_AGENT
result->expedite_regs = expedite_regs_${name};
- result->xmltarget = xmltarget_${name};
#endif
init_target_desc (result);
/* The features associated with this target. */
std::vector<tdesc_feature_up> features;
+ char *xmltarget = nullptr;
+
void accept (tdesc_element_visitor &v) const override
{
v.visit_pre (this);
int m_next_regnum = 0;
};
+/* See common/tdesc.h. */
+
+const char *
+tdesc_get_features_xml (target_desc *tdesc)
+{
+ if (tdesc->xmltarget == nullptr)
+ {
+ std::string buffer ("@");
+ print_xml_feature v (&buffer);
+ tdesc->accept (v);
+ tdesc->xmltarget = xstrdup (buffer.c_str ());
+ }
+ return tdesc->xmltarget;
+}
+
static void
maint_print_c_tdesc_cmd (const char *args, int from_tty)
{
= file_read_description_xml (tdesc_xml.data ());
if (tdesc == NULL || *tdesc != *e.second)
- failed++;
+ {
+ printf_filtered ( _("Descriptions for %s do not match\n"), e.first);
+ failed++;
+ continue;
+ }
+
+ /* Convert both descriptions to xml, and then back again. Confirm all
+ descriptions are identical. */
+
+ const char *xml = tdesc_get_features_xml ((target_desc *) tdesc);
+ const char *xml2 = tdesc_get_features_xml ((target_desc *) e.second);
+ gdb_assert (*xml == '@');
+ gdb_assert (*xml2 == '@');
+ const target_desc *t_trans = target_read_description_xml_string (xml+1);
+ const target_desc *t_trans2 = target_read_description_xml_string (xml2+1);
+
+ if (t_trans == NULL || t_trans2 == NULL)
+ {
+ printf_filtered (
+ _("Could not convert descriptions for %s back to xml (%p %p)\n"),
+ e.first, t_trans, t_trans2);
+ failed++;
+ }
+ else if (*tdesc != *t_trans || *tdesc != *t_trans2)
+ {
+ printf_filtered
+ (_("Translated descriptions for %s do not match (%d %d)\n"),
+ e.first, *tdesc == *t_trans, *tdesc == *t_trans2);
+ failed++;
+ }
}
printf_filtered (_("Tested %lu XML files, %d failed\n"),
(long) selftests::xml_tdesc.size (), failed);
return output;
#endif
}
+
+/* Take an xml string, parse it, and return the parsed description. Does not
+ handle a string containing includes. */
+
+const struct target_desc *
+target_read_description_xml_string (const char *xml_str)
+{
+ return tdesc_parse_xml (xml_str, nullptr, nullptr);
+}
otherwise. */
gdb::optional<std::string> target_fetch_description_xml (target_ops *ops);
+/* Take an xml string, parse it, and return the parsed description. Does not
+ handle a string containing includes. */
+
+const struct target_desc *target_read_description_xml_string (const char *);
+
#endif /* XML_TDESC_H */
projects / thirdparty / binutils-gdb.git / commitdiff
