@@ -288,6 +288,8 @@ struct gdbarch
gdbarch_get_siginfo_type_ftype *get_siginfo_type;
gdbarch_record_special_symbol_ftype *record_special_symbol;
gdbarch_get_syscall_number_ftype *get_syscall_number;
+ const char * xml_syscall_file;
+ struct syscalls_info * syscalls_info;
const char *const * stap_integer_prefixes;
const char *const * stap_integer_suffixes;
const char *const * stap_register_prefixes;
@@ -603,6 +605,8 @@ verify_gdbarch (struct gdbarch *gdbarch)
/* Skip verify of get_siginfo_type, has predicate. */
/* Skip verify of record_special_symbol, has predicate. */
/* Skip verify of get_syscall_number, has predicate. */
+ /* Skip verify of xml_syscall_file, invalid_p == 0 */
+ /* Skip verify of syscalls_info, invalid_p == 0 */
/* Skip verify of stap_integer_prefixes, invalid_p == 0 */
/* Skip verify of stap_integer_suffixes, invalid_p == 0 */
/* Skip verify of stap_register_prefixes, invalid_p == 0 */
@@ -1266,6 +1270,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
"gdbarch_dump: static_transform_name = <%s>\n",
host_address_to_string (gdbarch->static_transform_name));
fprintf_unfiltered (file,
+ "gdbarch_dump: syscalls_info = %s\n",
+ host_address_to_string (gdbarch->syscalls_info));
+ fprintf_unfiltered (file,
"gdbarch_dump: target_desc = %s\n",
host_address_to_string (gdbarch->target_desc));
fprintf_unfiltered (file,
@@ -1304,6 +1311,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
fprintf_unfiltered (file,
"gdbarch_dump: write_pc = <%s>\n",
host_address_to_string (gdbarch->write_pc));
+ fprintf_unfiltered (file,
+ "gdbarch_dump: xml_syscall_file = %s\n",
+ pstring (gdbarch->xml_syscall_file));
if (gdbarch->dump_tdep != NULL)
gdbarch->dump_tdep (gdbarch, file);
}
@@ -3887,6 +3897,40 @@ set_gdbarch_get_syscall_number (struct gdbarch *gdbarch,
gdbarch->get_syscall_number = get_syscall_number;
}
+const char *
+gdbarch_xml_syscall_file (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ /* Skip verify of xml_syscall_file, invalid_p == 0 */
+ if (gdbarch_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_xml_syscall_file called\n");
+ return gdbarch->xml_syscall_file;
+}
+
+void
+set_gdbarch_xml_syscall_file (struct gdbarch *gdbarch,
+ const char * xml_syscall_file)
+{
+ gdbarch->xml_syscall_file = xml_syscall_file;
+}
+
+struct syscalls_info *
+gdbarch_syscalls_info (struct gdbarch *gdbarch)
+{
+ gdb_assert (gdbarch != NULL);
+ /* Skip verify of syscalls_info, invalid_p == 0 */
+ if (gdbarch_debug >= 2)
+ fprintf_unfiltered (gdb_stdlog, "gdbarch_syscalls_info called\n");
+ return gdbarch->syscalls_info;
+}
+
+void
+set_gdbarch_syscalls_info (struct gdbarch *gdbarch,
+ struct syscalls_info * syscalls_info)
+{
+ gdbarch->syscalls_info = syscalls_info;
+}
+
const char *const *
gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch)
{
@@ -60,6 +60,7 @@ struct stap_parse_info;
struct ravenscar_arch_ops;
struct elf_internal_linux_prpsinfo;
struct mem_range;
+struct syscalls_info;
/* The architecture associated with the inferior through the
connection to the target.
@@ -1056,6 +1057,16 @@ typedef LONGEST (gdbarch_get_syscall_number_ftype) (struct gdbarch *gdbarch, pti
extern LONGEST gdbarch_get_syscall_number (struct gdbarch *gdbarch, ptid_t ptid);
extern void set_gdbarch_get_syscall_number (struct gdbarch *gdbarch, gdbarch_get_syscall_number_ftype *get_syscall_number);
+/* The filename of the XML syscall for this architecture. */
+
+extern const char * gdbarch_xml_syscall_file (struct gdbarch *gdbarch);
+extern void set_gdbarch_xml_syscall_file (struct gdbarch *gdbarch, const char * xml_syscall_file);
+
+/* Information about system calls from this architecture */
+
+extern struct syscalls_info * gdbarch_syscalls_info (struct gdbarch *gdbarch);
+extern void set_gdbarch_syscalls_info (struct gdbarch *gdbarch, struct syscalls_info * syscalls_info);
+
/* SystemTap related fields and functions.
A NULL-terminated array of prefixes used to mark an integer constant
on the architecture's assembly.
@@ -845,6 +845,12 @@ M:void:record_special_symbol:struct objfile *objfile, asymbol *sym:objfile, sym
# Get architecture-specific system calls information from registers.
M:LONGEST:get_syscall_number:ptid_t ptid:ptid
+# The filename of the XML syscall for this architecture.
+v:const char *:xml_syscall_file:::0:0::0:pstring (gdbarch->xml_syscall_file)
+
+# Information about system calls from this architecture
+v:struct syscalls_info *:syscalls_info:::0:0::0:host_address_to_string (gdbarch->syscalls_info)
+
# SystemTap related fields and functions.
# A NULL-terminated array of prefixes used to mark an integer constant
@@ -1156,6 +1162,7 @@ struct stap_parse_info;
struct ravenscar_arch_ops;
struct elf_internal_linux_prpsinfo;
struct mem_range;
+struct syscalls_info;
/* The architecture associated with the inferior through the
connection to the target.
@@ -22,6 +22,7 @@
#include "gdbtypes.h"
#include "xml-support.h"
#include "xml-syscall.h"
+#include "gdbarch.h"
/* For the struct syscall definition. */
#include "target.h"
@@ -46,14 +47,15 @@ syscall_warn_user (void)
}
void
-set_xml_syscall_file_name (const char *name)
+set_xml_syscall_file_name (const struct gdbarch *gdbarch,
+ const char *name)
{
return;
}
void
-get_syscall_by_number (int syscall_number,
- struct syscall *s)
+get_syscall_by_number (const struct gdbarch *gdbarch,
+ int syscall_number, struct syscall *s)
{
syscall_warn_user ();
s->number = syscall_number;
@@ -61,8 +63,8 @@ get_syscall_by_number (int syscall_number,
}
void
-get_syscall_by_name (const char *syscall_name,
- struct syscall *s)
+get_syscall_by_name (const struct gdbarch *gdbarch,
+ const char *syscall_name, struct syscall *s)
{
syscall_warn_user ();
s->number = UNKNOWN_SYSCALL;
@@ -70,7 +72,7 @@ get_syscall_by_name (const char *syscall_name,
}
const char **
-get_syscall_names (void)
+get_syscall_names (const struct gdbarch *gdbarch)
{
syscall_warn_user ();
return NULL;
@@ -78,10 +80,6 @@ get_syscall_names (void)
#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
{
@@ -101,6 +99,12 @@ struct syscalls_info
/* 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. */
@@ -108,19 +112,9 @@ struct syscall_parsing_data
{
/* 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)
{
@@ -128,7 +122,7 @@ allocate_syscalls_info (void)
}
static void
-sysinfo_free_syscalls_desc (struct syscall_desc *sd)
+syscalls_info_free_syscalls_desc (struct syscall_desc *sd)
{
xfree (sd->name);
}
@@ -136,27 +130,32 @@ sysinfo_free_syscalls_desc (struct syscall_desc *sd)
static void
free_syscalls_info (void *arg)
{
- struct syscalls_info *sysinfo = arg;
+ struct syscalls_info *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);
}
static struct cleanup *
-make_cleanup_free_syscalls_info (struct syscalls_info *sysinfo)
+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 = XCNEW (struct syscall_desc);
@@ -164,7 +163,7 @@ syscall_create_syscall_desc (struct syscalls_info *sysinfo,
sysdesc->name = xstrdup (name);
sysdesc->number = number;
- VEC_safe_push (syscall_desc_p, sysinfo->syscalls, sysdesc);
+ VEC_safe_push (syscall_desc_p, syscalls_info->syscalls, sysdesc);
}
/* Handle the start of a <syscall> element. */
@@ -194,7 +193,7 @@ syscall_start_syscall (struct gdb_xml_parser *parser,
}
gdb_assert (name);
- syscall_create_syscall_desc (data->sysinfo, name, number);
+ syscall_create_syscall_desc (data->syscalls_info, name, number);
}
@@ -225,15 +224,15 @@ syscall_parse_xml (const char *document, xml_fetch_another fetcher,
struct cleanup *result_cleanup;
struct syscall_parsing_data 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_quick (_("syscalls info"), NULL,
syselements, document, &data) == 0)
{
/* Parsed successfully. */
discard_cleanups (result_cleanup);
- return data.sysinfo;
+ return data.syscalls_info;
}
else
{
@@ -248,12 +247,12 @@ syscall_parse_xml (const char *document, xml_fetch_another fetcher,
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);
@@ -266,41 +265,47 @@ xml_init_syscalls_info (const char *filename)
if (dirname != NULL)
make_cleanup (xfree, dirname);
- sysinfo = syscall_parse_xml (full_file,
+ 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)
{
+ 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 (my_gdb_datadir && filename_cmp (my_gdb_datadir, gdb_datadir) != 0)
+ 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. */
- have_initialized_sysinfo = 0;
- xfree (my_gdb_datadir);
- my_gdb_datadir = NULL;
- if (sysinfo)
- free_syscalls_info ((void *) sysinfo);
+ free_syscalls_info (syscalls_info);
+ syscalls_info = NULL;
+ set_gdbarch_syscalls_info (gdbarch, NULL);
}
- /* Did we already try to initialize the structure? */
- if (have_initialized_sysinfo)
+ /* 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)
+ if (xml_syscall_file != NULL)
warning (_("Could not load the syscall XML file `%s/%s'."),
gdb_datadir, xml_syscall_file);
else
@@ -312,22 +317,25 @@ init_sysinfo (void)
}
/* Saving the data-directory used to read this XML info. */
- my_gdb_datadir = xstrdup (gdb_datadir);
+ 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;
@@ -336,18 +344,19 @@ xml_get_syscall_number (const struct syscalls_info *sysinfo,
}
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;
@@ -356,21 +365,22 @@ xml_get_syscall_name (const struct syscalls_info *sysinfo,
}
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);
+ nsyscalls = VEC_length (syscall_desc_p, syscalls_info->syscalls);
names = xmalloc ((nsyscalls + 1) * sizeof (char *));
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;
@@ -380,37 +390,37 @@ xml_list_of_syscalls (const struct syscalls_info *sysinfo)
}
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 */
@@ -29,22 +29,25 @@
GDB won't be able to find the correct XML file to open and get
the syscalls definitions. */
-void set_xml_syscall_file_name (const char *name);
+void set_xml_syscall_file_name (struct gdbarch *gdbarch,
+ const char *name);
/* Function that retrieves the syscall name corresponding to the given
number. It puts the requested information inside 'struct syscall'. */
-void get_syscall_by_number (int syscall_number, struct syscall *s);
+void get_syscall_by_number (struct gdbarch *gdbarch,
+ int syscall_number, struct syscall *s);
/* Function that retrieves the syscall number corresponding to the given
name. It puts the requested information inside 'struct syscall'. */
-void get_syscall_by_name (const char *syscall_name, struct syscall *s);
+void get_syscall_by_name (struct gdbarch *gdbarch,
+ const char *syscall_name, struct syscall *s);
/* Function used to retrieve the list of syscalls in the system. This list
is returned as an array of strings. Returns the list of syscalls in the
system, or NULL otherwise. */
-const char **get_syscall_names (void);
+const char **get_syscall_names (struct gdbarch *gdbarch);
#endif /* XML_SYSCALL_H */