Simplify XML parsing a bit.
* xml-support.h (gdb_xml_parse_quick): Declare. * xml-support.c (gdb_xml_create_parser_and_cleanup_1): Renamed from gdb_xml_create_parser_and_cleanup, and added `old_chain' parameter. (gdb_xml_create_parser_and_cleanup): Reimplement on top of gdb_xml_create_parser_and_cleanup_1. (gdb_xml_parse_quick): New. * memory-map.c (parse_memory_map): Use gdb_xml_parse_quick. * osdata.c (osdata_parse): Ditto. * remote.c (remote_threads_info): Ditto. * solib-target.c (solib_target_parse_libraries): Ditto. * xml-syscall.c (syscall_parse_xml): Ditto. * xml-tdesc.c (tdesc_parse_xml): Ditto.
This commit is contained in:
Pedro Alves
parent
f30f86fa95
commit
efc0eabd60
9 changed files with 111 additions and 71 deletions
|
|
@ -1,3 +1,21 @@
|
|||
2011-01-25 Pedro Alves <pedro@codesourcery.com>
|
||||
|
||||
Simplify XML parsing a bit.
|
||||
|
||||
* xml-support.h (gdb_xml_parse_quick): Declare.
|
||||
* xml-support.c (gdb_xml_create_parser_and_cleanup_1): Renamed
|
||||
from gdb_xml_create_parser_and_cleanup, and added `old_chain'
|
||||
parameter.
|
||||
(gdb_xml_create_parser_and_cleanup): Reimplement on top of
|
||||
gdb_xml_create_parser_and_cleanup_1.
|
||||
(gdb_xml_parse_quick): New.
|
||||
* memory-map.c (parse_memory_map): Use gdb_xml_parse_quick.
|
||||
* osdata.c (osdata_parse): Ditto.
|
||||
* remote.c (remote_threads_info): Ditto.
|
||||
* solib-target.c (solib_target_parse_libraries): Ditto.
|
||||
* xml-syscall.c (syscall_parse_xml): Ditto.
|
||||
* xml-tdesc.c (tdesc_parse_xml): Ditto.
|
||||
|
||||
2011-01-24 Kevin Buettner <kevinb@redhat.com>
|
||||
|
||||
* configure.tgt (mips*-*-elf): New; just like mips*-*-*, but
|
||||
|
|
|
|||
|
|
@ -178,25 +178,22 @@ const struct gdb_xml_element memory_map_elements[] = {
|
|||
VEC(mem_region_s) *
|
||||
parse_memory_map (const char *memory_map)
|
||||
{
|
||||
struct gdb_xml_parser *parser;
|
||||
VEC(mem_region_s) *result = NULL;
|
||||
struct cleanup *before_deleting_result, *back_to;
|
||||
struct cleanup *back_to;
|
||||
struct memory_map_parsing_data data = { NULL };
|
||||
|
||||
back_to = make_cleanup (null_cleanup, NULL);
|
||||
parser = gdb_xml_create_parser_and_cleanup (_("target memory map"),
|
||||
memory_map_elements, &data);
|
||||
|
||||
/* Note: 'clear_result' will zero 'result'. */
|
||||
before_deleting_result = make_cleanup (clear_result, &result);
|
||||
data.memory_map = &result;
|
||||
|
||||
if (gdb_xml_parse (parser, memory_map) == 0)
|
||||
/* Parsed successfully, don't need to delete the result. */
|
||||
discard_cleanups (before_deleting_result);
|
||||
back_to = make_cleanup (clear_result, &result);
|
||||
if (gdb_xml_parse_quick (_("target memory map"), NULL, memory_map_elements,
|
||||
memory_map, &data) == 0)
|
||||
{
|
||||
/* Parsed successfully, keep the result. */
|
||||
discard_cleanups (back_to);
|
||||
return result;
|
||||
}
|
||||
|
||||
do_cleanups (back_to);
|
||||
return result;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /* HAVE_LIBEXPAT */
|
||||
|
|
|
|||
22
gdb/osdata.c
22
gdb/osdata.c
|
|
@ -168,23 +168,21 @@ const struct gdb_xml_element osdata_elements[] = {
|
|||
struct osdata *
|
||||
osdata_parse (const char *xml)
|
||||
{
|
||||
struct gdb_xml_parser *parser;
|
||||
struct cleanup *before_deleting_result, *back_to;
|
||||
struct cleanup *back_to;
|
||||
struct osdata_parsing_data data = { NULL };
|
||||
|
||||
back_to = make_cleanup (null_cleanup, NULL);
|
||||
parser = gdb_xml_create_parser_and_cleanup (_("osdata"),
|
||||
osdata_elements, &data);
|
||||
gdb_xml_use_dtd (parser, "osdata.dtd");
|
||||
back_to = make_cleanup (clear_parsing_data, &data);
|
||||
|
||||
before_deleting_result = make_cleanup (clear_parsing_data, &data);
|
||||
|
||||
if (gdb_xml_parse (parser, xml) == 0)
|
||||
/* Parsed successfully, don't need to delete the result. */
|
||||
discard_cleanups (before_deleting_result);
|
||||
if (gdb_xml_parse_quick (_("osdata"), "osdata.dtd",
|
||||
osdata_elements, xml, &data) == 0)
|
||||
{
|
||||
/* Parsed successfully, don't need to delete the result. */
|
||||
discard_cleanups (back_to);
|
||||
return data.osdata;
|
||||
}
|
||||
|
||||
do_cleanups (back_to);
|
||||
return data.osdata;
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
21
gdb/remote.c
21
gdb/remote.c
|
|
@ -2595,25 +2595,16 @@ remote_threads_info (struct target_ops *ops)
|
|||
TARGET_OBJECT_THREADS, NULL);
|
||||
|
||||
struct cleanup *back_to = make_cleanup (xfree, xml);
|
||||
|
||||
if (xml && *xml)
|
||||
{
|
||||
struct gdb_xml_parser *parser;
|
||||
struct threads_parsing_context context;
|
||||
struct cleanup *clear_parsing_context;
|
||||
|
||||
context.items = 0;
|
||||
/* Note: this parser cleanup is already guarded by BACK_TO
|
||||
above. */
|
||||
parser = gdb_xml_create_parser_and_cleanup (_("threads"),
|
||||
threads_elements,
|
||||
&context);
|
||||
context.items = NULL;
|
||||
make_cleanup (clear_threads_parsing_context, &context);
|
||||
|
||||
gdb_xml_use_dtd (parser, "threads.dtd");
|
||||
|
||||
clear_parsing_context
|
||||
= make_cleanup (clear_threads_parsing_context, &context);
|
||||
|
||||
if (gdb_xml_parse (parser, xml) == 0)
|
||||
if (gdb_xml_parse_quick (_("threads"), "threads.dtd",
|
||||
threads_elements, xml, &context) == 0)
|
||||
{
|
||||
int i;
|
||||
struct thread_item *item;
|
||||
|
|
@ -2640,8 +2631,6 @@ remote_threads_info (struct target_ops *ops)
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
do_cleanups (clear_parsing_context);
|
||||
}
|
||||
|
||||
do_cleanups (back_to);
|
||||
|
|
|
|||
|
|
@ -227,24 +227,20 @@ const struct gdb_xml_element library_list_elements[] = {
|
|||
static VEC(lm_info_p) *
|
||||
solib_target_parse_libraries (const char *library)
|
||||
{
|
||||
struct gdb_xml_parser *parser;
|
||||
VEC(lm_info_p) *result = NULL;
|
||||
struct cleanup *before_deleting_result, *back_to;
|
||||
struct cleanup *back_to = make_cleanup (solib_target_free_library_list,
|
||||
&result);
|
||||
|
||||
back_to = make_cleanup (null_cleanup, NULL);
|
||||
parser = gdb_xml_create_parser_and_cleanup (_("target library list"),
|
||||
library_list_elements, &result);
|
||||
gdb_xml_use_dtd (parser, "library-list.dtd");
|
||||
|
||||
before_deleting_result = make_cleanup (solib_target_free_library_list,
|
||||
&result);
|
||||
|
||||
if (gdb_xml_parse (parser, library) == 0)
|
||||
/* Parsed successfully, don't need to delete the result. */
|
||||
discard_cleanups (before_deleting_result);
|
||||
if (gdb_xml_parse_quick (_("target library list"), "library-list.dtd",
|
||||
library_list_elements, library, &result) == 0)
|
||||
{
|
||||
/* Parsed successfully, keep the result. */
|
||||
discard_cleanups (back_to);
|
||||
return result;
|
||||
}
|
||||
|
||||
do_cleanups (back_to);
|
||||
return result;
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -427,13 +427,14 @@ gdb_xml_cleanup (void *arg)
|
|||
/* Initialize and return a parser. Register a cleanup to destroy the
|
||||
parser. */
|
||||
|
||||
struct gdb_xml_parser *
|
||||
gdb_xml_create_parser_and_cleanup (const char *name,
|
||||
const struct gdb_xml_element *elements,
|
||||
void *user_data)
|
||||
static struct gdb_xml_parser *
|
||||
gdb_xml_create_parser_and_cleanup_1 (const char *name,
|
||||
const struct gdb_xml_element *elements,
|
||||
void *user_data, struct cleanup **old_chain)
|
||||
{
|
||||
struct gdb_xml_parser *parser;
|
||||
struct scope_level start_scope;
|
||||
struct cleanup *dummy;
|
||||
|
||||
/* Initialize the parser. */
|
||||
parser = XZALLOC (struct gdb_xml_parser);
|
||||
|
|
@ -459,11 +460,27 @@ gdb_xml_create_parser_and_cleanup (const char *name,
|
|||
start_scope.elements = elements;
|
||||
VEC_safe_push (scope_level_s, parser->scopes, &start_scope);
|
||||
|
||||
make_cleanup (gdb_xml_cleanup, parser);
|
||||
if (old_chain == NULL)
|
||||
old_chain = &dummy;
|
||||
|
||||
*old_chain = make_cleanup (gdb_xml_cleanup, parser);
|
||||
return parser;
|
||||
}
|
||||
|
||||
/* Initialize and return a parser. Register a cleanup to destroy the
|
||||
parser. */
|
||||
|
||||
struct gdb_xml_parser *
|
||||
gdb_xml_create_parser_and_cleanup (const char *name,
|
||||
const struct gdb_xml_element *elements,
|
||||
void *user_data)
|
||||
{
|
||||
struct cleanup *old_chain;
|
||||
|
||||
return gdb_xml_create_parser_and_cleanup_1 (name, elements, user_data,
|
||||
&old_chain);
|
||||
}
|
||||
|
||||
/* External entity handler. The only external entities we support
|
||||
are those compiled into GDB (we do not fetch entities from the
|
||||
target). */
|
||||
|
|
@ -581,6 +598,26 @@ gdb_xml_parse (struct gdb_xml_parser *parser, const char *buffer)
|
|||
return -1;
|
||||
}
|
||||
|
||||
int
|
||||
gdb_xml_parse_quick (const char *name, const char *dtd_name,
|
||||
const struct gdb_xml_element *elements,
|
||||
const char *document, void *user_data)
|
||||
{
|
||||
struct gdb_xml_parser *parser;
|
||||
struct cleanup *back_to;
|
||||
int result;
|
||||
|
||||
parser = gdb_xml_create_parser_and_cleanup_1 (name, elements,
|
||||
user_data, &back_to);
|
||||
if (dtd_name != NULL)
|
||||
gdb_xml_use_dtd (parser, dtd_name);
|
||||
result = gdb_xml_parse (parser, document);
|
||||
|
||||
do_cleanups (back_to);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/* Parse a field VALSTR that we expect to contain an integer value.
|
||||
The integer is returned in *VALP. The string is parsed with an
|
||||
equivalent to strtoul.
|
||||
|
|
|
|||
|
|
@ -197,6 +197,18 @@ void gdb_xml_use_dtd (struct gdb_xml_parser *parser, const char *dtd_name);
|
|||
|
||||
int gdb_xml_parse (struct gdb_xml_parser *parser, const char *buffer);
|
||||
|
||||
/* 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, ...)
|
||||
|
|
|
|||
|
|
@ -224,17 +224,13 @@ syscall_parse_xml (const char *document, xml_fetch_another fetcher,
|
|||
void *fetcher_baton)
|
||||
{
|
||||
struct cleanup *result_cleanup;
|
||||
struct gdb_xml_parser *parser;
|
||||
struct syscall_parsing_data data;
|
||||
|
||||
parser = gdb_xml_create_parser_and_cleanup (_("syscalls info"),
|
||||
syselements, &data);
|
||||
|
||||
memset (&data, 0, sizeof (struct syscall_parsing_data));
|
||||
data.sysinfo = allocate_syscalls_info ();
|
||||
result_cleanup = make_cleanup_free_syscalls_info (data.sysinfo);
|
||||
|
||||
if (gdb_xml_parse (parser, document) == 0)
|
||||
if (gdb_xml_parse_quick (_("syscalls info"), NULL,
|
||||
syselements, document, &data) == 0)
|
||||
{
|
||||
/* Parsed successfully. */
|
||||
discard_cleanups (result_cleanup);
|
||||
|
|
|
|||
|
|
@ -505,7 +505,6 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher,
|
|||
void *fetcher_baton)
|
||||
{
|
||||
struct cleanup *back_to, *result_cleanup;
|
||||
struct gdb_xml_parser *parser;
|
||||
struct tdesc_parsing_data data;
|
||||
struct tdesc_xml_cache *cache;
|
||||
char *expanded_text;
|
||||
|
|
@ -531,16 +530,14 @@ tdesc_parse_xml (const char *document, xml_fetch_another fetcher,
|
|||
}
|
||||
|
||||
back_to = make_cleanup (null_cleanup, NULL);
|
||||
parser = gdb_xml_create_parser_and_cleanup (_("target description"),
|
||||
tdesc_elements, &data);
|
||||
gdb_xml_use_dtd (parser, "gdb-target.dtd");
|
||||
|
||||
memset (&data, 0, sizeof (struct tdesc_parsing_data));
|
||||
data.tdesc = allocate_target_description ();
|
||||
result_cleanup = make_cleanup_free_target_description (data.tdesc);
|
||||
make_cleanup (xfree, expanded_text);
|
||||
|
||||
if (gdb_xml_parse (parser, expanded_text) == 0)
|
||||
if (gdb_xml_parse_quick (_("target description"), "gdb-target.dtd",
|
||||
tdesc_elements, expanded_text, &data) == 0)
|
||||
{
|
||||
/* Parsed successfully. */
|
||||
struct tdesc_xml_cache new_cache;
|
||||
|
|
|
|||
Loading…
Reference in a new issue