9018be22e0
This patch started by changing target_read_alloc_1 to return a byte_vector, to avoid manual memory management (in target_read_alloc_1 and in the callers). To communicate failures to the callers, it actually returns a gdb::optional<gdb::byte_vector>. Adjusting target_read_stralloc was a bit more tricky, since it wants to return a buffer of char, and not gdb_byte. Since you can't just cast a gdb::byte_vector into a gdb::def_vector<char>, I made target_read_alloc_1 templated, so both versions (that return vectors of gdb_byte and char) are generated. Since target_read_stralloc now returns a gdb::char_vector instead of a gdb::unique_xmalloc_ptr<char>, a few callers need to be adjusted. gdb/ChangeLog: * common/byte-vector.h (char_vector): New type. * target.h (target_read_alloc): Return gdb::optional<byte_vector>. (target_read_stralloc): Return gdb::optional<char_vector>. (target_get_osdata): Return gdb::optional<char_vector>. * target.c (target_read_alloc_1): Templatize. Replacement manual memory management with vector. (target_read_alloc): Change return type, adjust. (target_read_stralloc): Change return type, adjust. (target_get_osdata): Change return type, adjust. * auxv.c (struct auxv_info) <length>: Remove. <data>: Change type to gdb::optional<byte_vector>. (auxv_inferior_data_cleanup): Free auxv_info with delete. (get_auxv_inferior_data): Allocate auxv_info with new, adjust. (target_auxv_search): Adjust. (fprint_target_auxv): Adjust. * avr-tdep.c (avr_io_reg_read_command): Adjust. * linux-tdep.c (linux_spu_make_corefile_notes): Adjust. (linux_make_corefile_notes): Adjust. * osdata.c (get_osdata): Adjust. * remote.c (remote_get_threads_with_qxfer): Adjust. (remote_memory_map): Adjust. (remote_traceframe_info): Adjust. (btrace_read_config): Adjust. (remote_read_btrace): Adjust. (remote_pid_to_exec_file): Adjust. * solib-aix.c (solib_aix_get_library_list): Adjust. * solib-dsbt.c (decode_loadmap): Don't free buf. (dsbt_get_initial_loadmaps): Adjust. * solib-svr4.c (svr4_current_sos_via_xfer_libraries): Adjust. * solib-target.c (solib_target_current_sos): Adjust. * tracepoint.c (sdata_make_value): Adjust. * xml-support.c (xinclude_start_include): Adjust. (xml_fetch_content_from_file): Adjust. * xml-support.h (xml_fetch_another): Change return type. (xml_fetch_content_from_file): Change return type. * xml-syscall.c (xml_init_syscalls_info): Adjust. * xml-tdesc.c (file_read_description_xml): Adjust. (fetch_available_features_from_target): Change return type. (target_fetch_description_xml): Adjust. (target_read_description_xml): Adjust.
242 lines
8.0 KiB
C++
242 lines
8.0 KiB
C++
/* Helper routines for parsing XML using Expat.
|
|
|
|
Copyright (C) 2006-2018 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
#ifndef XML_SUPPORT_H
|
|
#define XML_SUPPORT_H
|
|
|
|
#include "gdb_obstack.h"
|
|
#include "vec.h"
|
|
#include "xml-utils.h"
|
|
#include "common/byte-vector.h"
|
|
|
|
struct gdb_xml_parser;
|
|
struct gdb_xml_element;
|
|
struct gdb_xml_attribute;
|
|
|
|
/* Return an XML document which was compiled into GDB, from
|
|
the given FILENAME, or NULL if the file was not compiled in. */
|
|
|
|
const char *fetch_xml_builtin (const char *filename);
|
|
|
|
/* A to_xfer_partial helper function which reads XML files which were
|
|
compiled into GDB. The target may call this function from its own
|
|
to_xfer_partial handler, after converting object and annex to the
|
|
appropriate filename. */
|
|
|
|
LONGEST xml_builtin_xfer_partial (const char *filename,
|
|
gdb_byte *readbuf, const gdb_byte *writebuf,
|
|
ULONGEST offset, LONGEST len);
|
|
|
|
/* The text of compiled-in XML documents, from xml-builtin.c
|
|
(generated). */
|
|
|
|
extern const char *xml_builtin[][2];
|
|
|
|
/* Support for XInclude. */
|
|
|
|
/* Callback to fetch a new XML file, based on the provided HREF. */
|
|
|
|
typedef gdb::optional<gdb::char_vector> (*xml_fetch_another) (const char *href,
|
|
void *baton);
|
|
|
|
/* Append the expansion of TEXT after processing <xi:include> tags in
|
|
RESULT. FETCHER will be called (with FETCHER_BATON) to retrieve
|
|
any new files. DEPTH should be zero on the initial call.
|
|
|
|
On failure, this function uses NAME in a warning and returns false.
|
|
It may throw an exception, but does not for XML parsing
|
|
problems. */
|
|
|
|
bool xml_process_xincludes (std::string &result,
|
|
const char *name, const char *text,
|
|
xml_fetch_another fetcher, void *fetcher_baton,
|
|
int depth);
|
|
|
|
/* Simplified XML parser infrastructure. */
|
|
|
|
/* A name and value pair, used to record parsed attributes. */
|
|
|
|
struct gdb_xml_value
|
|
{
|
|
gdb_xml_value (const char *name_, void *value_)
|
|
: name (name_), value (value_)
|
|
{}
|
|
|
|
const char *name;
|
|
gdb::unique_xmalloc_ptr<void> value;
|
|
};
|
|
|
|
/* The type of an attribute handler.
|
|
|
|
PARSER is the current XML parser, which should be used to issue any
|
|
debugging or error messages. The second argument is the
|
|
corresponding attribute description, so that a single handler can
|
|
be used for multiple attributes; the attribute name is available
|
|
for error messages and the handler data is available for additional
|
|
customization (see gdb_xml_parse_attr_enum). VALUE is the string
|
|
value of the attribute.
|
|
|
|
The returned value should be freeable with xfree, and will be freed
|
|
after the start handler is called. Errors should be reported by
|
|
calling gdb_xml_error. */
|
|
|
|
typedef void *(gdb_xml_attribute_handler) (struct gdb_xml_parser *parser,
|
|
const struct gdb_xml_attribute *,
|
|
const char *value);
|
|
|
|
/* Flags for attributes. If no flags are specified, the attribute is
|
|
required. */
|
|
|
|
enum gdb_xml_attribute_flag
|
|
{
|
|
GDB_XML_AF_NONE,
|
|
GDB_XML_AF_OPTIONAL = 1 << 0, /* The attribute is optional. */
|
|
};
|
|
|
|
/* An expected attribute and the handler to call when it is
|
|
encountered. Arrays of struct gdb_xml_attribute are terminated
|
|
by an entry with NAME == NULL. */
|
|
|
|
struct gdb_xml_attribute
|
|
{
|
|
const char *name;
|
|
int flags;
|
|
gdb_xml_attribute_handler *handler;
|
|
const void *handler_data;
|
|
};
|
|
|
|
/* Flags for elements. If no flags are specified, the element is
|
|
required exactly once. */
|
|
|
|
enum gdb_xml_element_flag
|
|
{
|
|
GDB_XML_EF_NONE,
|
|
GDB_XML_EF_OPTIONAL = 1 << 0, /* The element is optional. */
|
|
GDB_XML_EF_REPEATABLE = 1 << 1, /* The element is repeatable. */
|
|
};
|
|
|
|
/* A handler called at the beginning of an element.
|
|
|
|
PARSER is the current XML parser, which should be used to issue any
|
|
debugging or error messages. ELEMENT is the current element.
|
|
USER_DATA is the opaque pointer supplied when the parser was
|
|
created. ATTRIBUTES is a vector of the values of any attributes
|
|
attached to this element.
|
|
|
|
The start handler will only be called if all the required
|
|
attributes were present and parsed successfully, and elements of
|
|
ATTRIBUTES are guaranteed to be in the same order used in
|
|
ELEMENT->ATTRIBUTES (not the order from the XML file). Accordingly
|
|
fixed offsets can be used to find any non-optional attributes as
|
|
long as no optional attributes precede them. */
|
|
|
|
typedef void (gdb_xml_element_start_handler)
|
|
(struct gdb_xml_parser *parser, const struct gdb_xml_element *element,
|
|
void *user_data, std::vector<gdb_xml_value> &attributes);
|
|
|
|
/* A handler called at the end of an element.
|
|
|
|
PARSER, ELEMENT, and USER_DATA are as for the start handler. BODY
|
|
is any accumulated body text inside the element, with leading and
|
|
trailing whitespace removed. It will never be NULL. */
|
|
|
|
typedef void (gdb_xml_element_end_handler)
|
|
(struct gdb_xml_parser *, const struct gdb_xml_element *,
|
|
void *user_data, const char *body_text);
|
|
|
|
/* An expected element and the handlers to call when it is
|
|
encountered. Arrays of struct gdb_xml_element are terminated
|
|
by an entry with NAME == NULL. */
|
|
|
|
struct gdb_xml_element
|
|
{
|
|
const char *name;
|
|
const struct gdb_xml_attribute *attributes;
|
|
const struct gdb_xml_element *children;
|
|
int flags;
|
|
|
|
gdb_xml_element_start_handler *start_handler;
|
|
gdb_xml_element_end_handler *end_handler;
|
|
};
|
|
|
|
/* Parse a XML document. DOCUMENT is the data to parse, which should
|
|
be NUL-terminated. If non-NULL, use the compiled-in DTD named
|
|
DTD_NAME to drive the parsing.
|
|
|
|
The return value is 0 for success or -1 for error. It may throw,
|
|
but only if something unexpected goes wrong during parsing; parse
|
|
errors will be caught, warned about, and reported as failure. */
|
|
|
|
int gdb_xml_parse_quick (const char *name, const char *dtd_name,
|
|
const struct gdb_xml_element *elements,
|
|
const char *document, void *user_data);
|
|
|
|
/* Issue a debugging message from one of PARSER's handlers. */
|
|
|
|
void gdb_xml_debug (struct gdb_xml_parser *parser, const char *format, ...)
|
|
ATTRIBUTE_PRINTF (2, 3);
|
|
|
|
/* Issue an error message from one of PARSER's handlers, and stop
|
|
parsing. */
|
|
|
|
void gdb_xml_error (struct gdb_xml_parser *parser, const char *format, ...)
|
|
ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (2, 3);
|
|
|
|
/* Find the attribute named NAME in the set of parsed attributes
|
|
ATTRIBUTES. Returns NULL if not found. */
|
|
|
|
struct gdb_xml_value *xml_find_attribute
|
|
(std::vector<gdb_xml_value> &attributes, const char *name);
|
|
|
|
/* Parse an integer attribute into a ULONGEST. */
|
|
|
|
extern gdb_xml_attribute_handler gdb_xml_parse_attr_ulongest;
|
|
|
|
/* Map NAME to VALUE. A struct gdb_xml_enum * should be saved as the
|
|
value of handler_data when using gdb_xml_parse_attr_enum to parse a
|
|
fixed list of possible strings. The list is terminated by an entry
|
|
with NAME == NULL. */
|
|
|
|
struct gdb_xml_enum
|
|
{
|
|
const char *name;
|
|
ULONGEST value;
|
|
};
|
|
|
|
/* A handler_data for yes/no boolean values. */
|
|
extern const struct gdb_xml_enum gdb_xml_enums_boolean[];
|
|
|
|
extern gdb_xml_attribute_handler gdb_xml_parse_attr_enum;
|
|
|
|
/* Parse an integer string into a ULONGEST and return it, or call
|
|
gdb_xml_error if it could not be parsed. */
|
|
|
|
ULONGEST gdb_xml_parse_ulongest (struct gdb_xml_parser *parser,
|
|
const char *value);
|
|
|
|
/* Open FILENAME, read all its text into memory, close it, and return
|
|
the text. If something goes wrong, return an uninstantiated optional
|
|
and warn. */
|
|
|
|
extern gdb::optional<gdb::char_vector> xml_fetch_content_from_file
|
|
(const char *filename, void *baton);
|
|
|
|
#endif
|