/* Functions that provide the mechanism to parse a syscall XML file
and get its values.
- Copyright (C) 1986, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
- 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 2009-2012 Free Software Foundation, Inc.
This file is part of GDB.
void
set_xml_syscall_file_name (const char *name)
{
- syscall_warn_user ();
+ return;
}
void
return NULL;
}
-
#else /* ! HAVE_LIBEXPAT */
+/* Variable that will hold the last known data-directory. This is useful to
+ know whether we should re-read the XML info for the target. */
+static char *my_gdb_datadir = NULL;
+
/* Structure which describes a syscall. */
typedef struct syscall_desc
{
/* Structure used to store information about the available syscalls in
the system. */
-static const struct syscalls_info *_sysinfo = NULL;
+static const struct syscalls_info *sysinfo = NULL;
/* A flag to tell if we already initialized the structure above. */
static int have_initialized_sysinfo = 0;
VEC_safe_push (syscall_desc_p, sysinfo->syscalls, sysdesc);
}
-/* Handle the start of a <syscalls_info> element. */
-static void
-syscall_start_syscalls_info (struct gdb_xml_parser *parser,
- const struct gdb_xml_element *element,
- void *user_data,
- VEC(gdb_xml_value_s) *attributes)
-{
- struct syscall_parsing_data *data = user_data;
- struct syscalls_info *sysinfo = data->sysinfo;
-}
-
/* Handle the start of a <syscall> element. */
static void
syscall_start_syscall (struct gdb_xml_parser *parser,
_("Unknown attribute name '%s'."), attrs[i].name);
}
+ gdb_assert (name);
syscall_create_syscall_desc (data->sysinfo, name, number);
}
static const struct gdb_xml_element syselements[] = {
{ "syscalls_info", NULL, syscalls_info_children,
- GDB_XML_EF_NONE, syscall_start_syscalls_info, NULL },
+ GDB_XML_EF_NONE, NULL, NULL },
{ NULL, NULL, NULL, GDB_XML_EF_NONE, NULL, NULL }
};
void *fetcher_baton)
{
struct cleanup *result_cleanup;
- struct gdb_xml_parser *parser;
struct syscall_parsing_data data;
- char *expanded_text;
- int i;
- 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);
full_file = xml_fetch_content_from_file (filename, gdb_datadir);
if (full_file == NULL)
- {
- warning (_("Could not open \"%s\""), filename);
- return NULL;
- }
+ return NULL;
back_to = make_cleanup (xfree, full_file);
if (dirname != NULL)
make_cleanup (xfree, dirname);
- sysinfo = syscall_parse_xml (full_file, xml_fetch_content_from_file, dirname);
+ sysinfo = syscall_parse_xml (full_file,
+ xml_fetch_content_from_file, dirname);
do_cleanups (back_to);
return sysinfo;
static void
init_sysinfo (void)
{
+ /* Should we re-read the XML info for this target? */
+ if (my_gdb_datadir && filename_cmp (my_gdb_datadir, gdb_datadir) != 0)
+ {
+ /* The data-directory changed from the last time we used it.
+ It means that we have to re-read the XML info. */
+ have_initialized_sysinfo = 0;
+ xfree (my_gdb_datadir);
+ my_gdb_datadir = NULL;
+ if (sysinfo)
+ free_syscalls_info ((void *) sysinfo);
+ }
+
/* Did we already try to initialize the structure? */
if (have_initialized_sysinfo)
return;
-/* if (xml_syscall_file == NULL)
- internal_error (__FILE__, __LINE__,
- _("This architecture has not set the XML syscall file "
- "name. This is a bug and should not happen; please "
- "report it.")); */
- _sysinfo = xml_init_syscalls_info (xml_syscall_file);
+ sysinfo = xml_init_syscalls_info (xml_syscall_file);
have_initialized_sysinfo = 1;
- if (_sysinfo == NULL)
+ if (sysinfo == NULL)
{
if (xml_syscall_file)
- /* The initialization failed. Let's show a warning
- message to the user (just this time) and leave. */
- warning (_("Could not load the syscall XML file `%s'.\n\
-GDB will not be able to display syscall names."), xml_syscall_file);
+ warning (_("Could not load the syscall XML file `%s/%s'."),
+ gdb_datadir, xml_syscall_file);
else
- /* There's no file to open. Let's warn the user. */
- warning (_("There is no XML file to open.\n\
-GDB will not be able to display syscall names."));
+ warning (_("There is no XML file to open."));
+
+ warning (_("GDB will not be able to display "
+ "syscall names nor to verify if\n"
+ "any provided syscall numbers are valid."));
}
+
+ /* Saving the data-directory used to read this XML info. */
+ my_gdb_datadir = xstrdup (gdb_datadir);
}
static int
return NULL;
}
-static int
-xml_number_of_syscalls (const struct syscalls_info *sysinfo)
-{
- return (sysinfo == NULL ? 0 : VEC_length (syscall_desc_p,
- sysinfo->syscalls));
-}
-
static const char **
xml_list_of_syscalls (const struct syscalls_info *sysinfo)
{
init_sysinfo ();
s->number = syscall_number;
- s->name = xml_get_syscall_name (_sysinfo, syscall_number);
+ s->name = xml_get_syscall_name (sysinfo, syscall_number);
}
void
{
init_sysinfo ();
- s->number = xml_get_syscall_number (_sysinfo, syscall_name);
+ s->number = xml_get_syscall_number (sysinfo, syscall_name);
s->name = syscall_name;
}
{
init_sysinfo ();
- return xml_list_of_syscalls (_sysinfo);
+ return xml_list_of_syscalls (sysinfo);
}
#endif /* ! HAVE_LIBEXPAT */
projects / deliverable / binutils-gdb.git / blobdiff