/* Functions that provide the mechanism to parse a syscall XML file
and get its values.
- Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2009-2016 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbtypes.h"
#include "xml-support.h"
#include "xml-syscall.h"
+#include "gdbarch.h"
/* For the struct syscall definition. */
#include "target.h"
#include "filenames.h"
-#include "gdb_assert.h"
-
#ifndef HAVE_LIBEXPAT
/* Dummy functions to indicate that there's no support for fetching
}
void
-set_xml_syscall_file_name (const char *name)
+set_xml_syscall_file_name (struct gdbarch *gdbarch, const char *name)
{
return;
}
void
-get_syscall_by_number (int syscall_number,
- struct syscall *s)
+get_syscall_by_number (struct gdbarch *gdbarch,
+ int syscall_number, struct syscall *s)
{
syscall_warn_user ();
s->number = syscall_number;
}
void
-get_syscall_by_name (const char *syscall_name,
- struct syscall *s)
+get_syscall_by_name (struct gdbarch *gdbarch, const char *syscall_name,
+ struct syscall *s)
{
syscall_warn_user ();
s->number = UNKNOWN_SYSCALL;
}
const char **
-get_syscall_names (void)
+get_syscall_names (struct gdbarch *gdbarch)
{
syscall_warn_user ();
return NULL;
/* The syscalls. */
VEC(syscall_desc_p) *syscalls;
+
+ /* 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. */
+
+ char *my_gdb_datadir;
};
/* Callback data for syscall information parsing. */
{
/* The syscalls_info we are building. */
- struct syscalls_info *sysinfo;
+ struct syscalls_info *syscalls_info;
};
-/* Structure used to store information about the available syscalls in
- the system. */
-static const struct syscalls_info *sysinfo = NULL;
-
-/* A flag to tell if we already initialized the structure above. */
-static int have_initialized_sysinfo = 0;
-
-/* The filename of the syscall's XML. */
-static const char *xml_syscall_file = NULL;
-
static struct syscalls_info *
allocate_syscalls_info (void)
{
- return XZALLOC (struct syscalls_info);
+ return XCNEW (struct syscalls_info);
}
static void
-sysinfo_free_syscalls_desc (struct syscall_desc *sd)
+syscalls_info_free_syscalls_desc (struct syscall_desc *sd)
{
xfree (sd->name);
}
static void
free_syscalls_info (void *arg)
{
- struct syscalls_info *sysinfo = arg;
+ struct syscalls_info *syscalls_info = (struct syscalls_info *) arg;
struct syscall_desc *sysdesc;
int i;
- for (i = 0;
- VEC_iterate (syscall_desc_p, sysinfo->syscalls, i, sysdesc);
- i++)
- sysinfo_free_syscalls_desc (sysdesc);
- VEC_free (syscall_desc_p, sysinfo->syscalls);
+ xfree (syscalls_info->my_gdb_datadir);
+
+ if (syscalls_info->syscalls != NULL)
+ {
+ for (i = 0;
+ VEC_iterate (syscall_desc_p, syscalls_info->syscalls, i, sysdesc);
+ i++)
+ syscalls_info_free_syscalls_desc (sysdesc);
+ VEC_free (syscall_desc_p, syscalls_info->syscalls);
+ }
- xfree (sysinfo);
+ xfree (syscalls_info);
}
-struct cleanup *
-make_cleanup_free_syscalls_info (struct syscalls_info *sysinfo)
+static struct cleanup *
+make_cleanup_free_syscalls_info (struct syscalls_info *syscalls_info)
{
- return make_cleanup (free_syscalls_info, sysinfo);
+ return make_cleanup (free_syscalls_info, syscalls_info);
}
static void
-syscall_create_syscall_desc (struct syscalls_info *sysinfo,
+syscall_create_syscall_desc (struct syscalls_info *syscalls_info,
const char *name, int number)
{
- struct syscall_desc *sysdesc = XZALLOC (struct syscall_desc);
+ struct syscall_desc *sysdesc = XCNEW (struct syscall_desc);
sysdesc->name = xstrdup (name);
sysdesc->number = number;
- 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;
+ VEC_safe_push (syscall_desc_p, syscalls_info->syscalls, sysdesc);
}
/* Handle the start of a <syscall> element. */
const struct gdb_xml_element *element,
void *user_data, VEC(gdb_xml_value_s) *attributes)
{
- struct syscall_parsing_data *data = user_data;
+ struct syscall_parsing_data *data = (struct syscall_parsing_data *) user_data;
struct gdb_xml_value *attrs = VEC_address (gdb_xml_value_s, attributes);
int len, i;
/* syscall info. */
for (i = 0; i < len; i++)
{
if (strcmp (attrs[i].name, "name") == 0)
- name = attrs[i].value;
+ name = (char *) attrs[i].value;
else if (strcmp (attrs[i].name, "number") == 0)
number = * (ULONGEST *) attrs[i].value;
else
_("Unknown attribute name '%s'."), attrs[i].name);
}
- syscall_create_syscall_desc (data->sysinfo, name, number);
+ gdb_assert (name);
+ syscall_create_syscall_desc (data->syscalls_info, 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);
+ data.syscalls_info = allocate_syscalls_info ();
+ result_cleanup = make_cleanup_free_syscalls_info (data.syscalls_info);
- 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);
- return data.sysinfo;
+ return data.syscalls_info;
}
else
{
struct syscalls_info with the values.
Returns the struct syscalls_info if the file is valid, NULL otherwise. */
-static const struct syscalls_info *
+static struct syscalls_info *
xml_init_syscalls_info (const char *filename)
{
char *full_file;
char *dirname;
- struct syscalls_info *sysinfo;
+ struct syscalls_info *syscalls_info;
struct cleanup *back_to;
full_file = xml_fetch_content_from_file (filename, gdb_datadir);
if (dirname != NULL)
make_cleanup (xfree, dirname);
- sysinfo = syscall_parse_xml (full_file, xml_fetch_content_from_file, dirname);
+ syscalls_info = syscall_parse_xml (full_file,
+ xml_fetch_content_from_file, dirname);
do_cleanups (back_to);
- return sysinfo;
+ return syscalls_info;
}
/* Initializes the syscalls_info structure according to the
architecture. */
static void
-init_sysinfo (void)
+init_syscalls_info (struct gdbarch *gdbarch)
{
- /* Did we already try to initialize the structure? */
- if (have_initialized_sysinfo)
+ struct syscalls_info *syscalls_info = gdbarch_syscalls_info (gdbarch);
+ const char *xml_syscall_file = gdbarch_xml_syscall_file (gdbarch);
+
+ /* Should we re-read the XML info for this target? */
+ if (syscalls_info != NULL && syscalls_info->my_gdb_datadir != NULL
+ && filename_cmp (syscalls_info->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. */
+ free_syscalls_info (syscalls_info);
+ syscalls_info = NULL;
+ set_gdbarch_syscalls_info (gdbarch, NULL);
+ }
+
+ /* Did we succeed at initializing this? */
+ if (syscalls_info != NULL)
return;
- sysinfo = xml_init_syscalls_info (xml_syscall_file);
+ syscalls_info = xml_init_syscalls_info (xml_syscall_file);
- have_initialized_sysinfo = 1;
+ /* If there was some error reading the XML file, we initialize
+ gdbarch->syscalls_info anyway, in order to store information
+ about our attempt. */
+ if (syscalls_info == NULL)
+ syscalls_info = allocate_syscalls_info ();
- if (sysinfo == NULL)
+ if (syscalls_info->syscalls == NULL)
{
- if (xml_syscall_file)
- warning (_("\
-Could not load the syscall XML file `%s'."), xml_syscall_file);
+ if (xml_syscall_file != NULL)
+ warning (_("Could not load the syscall XML file `%s/%s'."),
+ gdb_datadir, xml_syscall_file);
else
- warning (_("\
-There is no XML file to open."));
+ 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."));
+ 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. */
+ syscalls_info->my_gdb_datadir = xstrdup (gdb_datadir);
+
+ set_gdbarch_syscalls_info (gdbarch, syscalls_info);
}
static int
-xml_get_syscall_number (const struct syscalls_info *sysinfo,
+xml_get_syscall_number (struct gdbarch *gdbarch,
const char *syscall_name)
{
+ struct syscalls_info *syscalls_info = gdbarch_syscalls_info (gdbarch);
struct syscall_desc *sysdesc;
int i;
- if (sysinfo == NULL
+ if (syscalls_info == NULL
|| syscall_name == NULL)
return UNKNOWN_SYSCALL;
for (i = 0;
- VEC_iterate(syscall_desc_p, sysinfo->syscalls, i, sysdesc);
+ VEC_iterate(syscall_desc_p, syscalls_info->syscalls, i, sysdesc);
i++)
if (strcmp (sysdesc->name, syscall_name) == 0)
return sysdesc->number;
}
static const char *
-xml_get_syscall_name (const struct syscalls_info *sysinfo,
+xml_get_syscall_name (struct gdbarch *gdbarch,
int syscall_number)
{
+ struct syscalls_info *syscalls_info = gdbarch_syscalls_info (gdbarch);
struct syscall_desc *sysdesc;
int i;
- if (sysinfo == NULL
+ if (syscalls_info == NULL
|| syscall_number < 0)
return NULL;
for (i = 0;
- VEC_iterate(syscall_desc_p, sysinfo->syscalls, i, sysdesc);
+ VEC_iterate(syscall_desc_p, syscalls_info->syscalls, i, sysdesc);
i++)
if (sysdesc->number == syscall_number)
return sysdesc->name;
}
static const char **
-xml_list_of_syscalls (const struct syscalls_info *sysinfo)
+xml_list_of_syscalls (struct gdbarch *gdbarch)
{
+ struct syscalls_info *syscalls_info = gdbarch_syscalls_info (gdbarch);
struct syscall_desc *sysdesc;
const char **names = NULL;
int nsyscalls;
int i;
- if (sysinfo == NULL)
+ if (syscalls_info == NULL)
return NULL;
- nsyscalls = VEC_length (syscall_desc_p, sysinfo->syscalls);
- names = xmalloc ((nsyscalls + 1) * sizeof (char *));
+ nsyscalls = VEC_length (syscall_desc_p, syscalls_info->syscalls);
+ names = XNEWVEC (const char *, nsyscalls + 1);
for (i = 0;
- VEC_iterate (syscall_desc_p, sysinfo->syscalls, i, sysdesc);
+ VEC_iterate (syscall_desc_p, syscalls_info->syscalls, i, sysdesc);
i++)
names[i] = sysdesc->name;
}
void
-set_xml_syscall_file_name (const char *name)
+set_xml_syscall_file_name (struct gdbarch *gdbarch, const char *name)
{
- xml_syscall_file = name;
+ set_gdbarch_xml_syscall_file (gdbarch, name);
}
void
-get_syscall_by_number (int syscall_number,
- struct syscall *s)
+get_syscall_by_number (struct gdbarch *gdbarch,
+ int syscall_number, struct syscall *s)
{
- init_sysinfo ();
+ init_syscalls_info (gdbarch);
s->number = syscall_number;
- s->name = xml_get_syscall_name (sysinfo, syscall_number);
+ s->name = xml_get_syscall_name (gdbarch, syscall_number);
}
void
-get_syscall_by_name (const char *syscall_name,
- struct syscall *s)
+get_syscall_by_name (struct gdbarch *gdbarch,
+ const char *syscall_name, struct syscall *s)
{
- init_sysinfo ();
+ init_syscalls_info (gdbarch);
- s->number = xml_get_syscall_number (sysinfo, syscall_name);
+ s->number = xml_get_syscall_number (gdbarch, syscall_name);
s->name = syscall_name;
}
const char **
-get_syscall_names (void)
+get_syscall_names (struct gdbarch *gdbarch)
{
- init_sysinfo ();
+ init_syscalls_info (gdbarch);
- return xml_list_of_syscalls (sysinfo);
+ return xml_list_of_syscalls (gdbarch);
}
#endif /* ! HAVE_LIBEXPAT */
projects / deliverable / binutils-gdb.git / blobdiff