[PATCH V4 3/6] Use linux_get_siginfo_type_with_fields for x86.

Walfred Tedeschi
2016-01-21T14:48:59Z

Use linux_get_siginfo_type_with_fields for adding bound fields on
segmentation fault for i386/amd64 siginfo.

2016-01-15 Walfred Tedeschi <walfred.tedeschi@intel.com>

gdb/ChangeLog:

* linux-tdep.h (linux_get_siginfo_type_with_fields): Make extern.
* linux-tdep.c (linux_get_siginfo_type_with_fields): Make extern.
* i386-linux-tdep.h (x86_linux_get_siginfo_type): New
function.
* amd64-linux-tdep.c (amd64_linux_init_abi_common): Add
x86_linux_get_siginfo_type for the amd64 abi.
* i386-linux-tdep.c (x86_linux_get_siginfo_type): New
Function.
(i386_linux_init_abi): Add new function at the i386 ABI
initialization.

---
gdb/amd64-linux-tdep.c | 2 ++
gdb/i386-linux-tdep.c | 8 ++++++++
gdb/i386-linux-tdep.h | 3 +++
gdb/linux-tdep.c | 2 +-
gdb/linux-tdep.h | 4 ++++
5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index b948ea7..21bcd99 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -1838,6 +1838,8 @@ amd64_linux_init_abi_common(struct gdbarch_info info, struct gdbarch *gdbarch)

set_gdbarch_process_record (gdbarch, i386_process_record);
set_gdbarch_process_record_signal (gdbarch, amd64_linux_record_signal);
+
+ set_gdbarch_get_siginfo_type (gdbarch, x86_linux_get_siginfo_type);
}

static void
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 1e491e7..af39e78 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -656,6 +656,12 @@ i386_linux_supply_xstateregset (const struct regset *regset,
i387_supply_xsave (regcache, regnum, xstateregs);
}

+struct type *
+x86_linux_get_siginfo_type (struct gdbarch *gdbarch)
+{
+ return linux_get_siginfo_type_with_fields (gdbarch, LINUX_SIGINFO_FIELD_ADDR_BND);
+}
+
/* Similar to i386_collect_fpregset, but use XSAVE extended state. */

static void
@@ -994,6 +1000,8 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
set_xml_syscall_file_name (gdbarch, XML_SYSCALL_FILENAME_I386);
set_gdbarch_get_syscall_number (gdbarch,
i386_linux_get_syscall_number);
+
+ set_gdbarch_get_siginfo_type (gdbarch, x86_linux_get_siginfo_type);
}

/* Provide a prototype to silence -Wmissing-prototypes. */
diff --git a/gdb/i386-linux-tdep.h b/gdb/i386-linux-tdep.h
index ee6abff..f8e0074 100644
--- a/gdb/i386-linux-tdep.h
+++ b/gdb/i386-linux-tdep.h
@@ -72,4 +72,7 @@ extern struct target_desc *tdesc_i386_avx512_linux;

extern int i386_linux_gregset_reg_offset[];

+/* Returns x86 siginfo type with extra fields. */
+extern struct type *x86_get_siginfo_type_with_fields (struct gdbarch *gdbarch);
+
#endif /* i386-linux-tdep.h */
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 48bed11..a49057f 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -246,7 +246,7 @@ get_linux_inferior_data (void)
/* This function is suitable for architectures that
extend/override the standard siginfo in an specific way. */

-static struct type *
+struct type *
linux_get_siginfo_type_with_fields (struct gdbarch *gdbarch,
linux_siginfo_extra_fields extra_fields)
{
diff --git a/gdb/linux-tdep.h b/gdb/linux-tdep.h
index 98a17fa..5fcd266 100644
--- a/gdb/linux-tdep.h
+++ b/gdb/linux-tdep.h
@@ -34,6 +34,10 @@ enum linux_siginfo_extra_field_values
/* Defines a type for the values defined in linux_siginfo_extra_field_values. */
DEF_ENUM_FLAGS_TYPE (enum linux_siginfo_extra_field_values, linux_siginfo_extra_fields);

+/* Return the siginfo type with additional fields. */
+struct type *linux_get_siginfo_type_with_fields (struct gdbarch *gdbarch,
+ linux_siginfo_extra_fields);
+
typedef char *(*linux_collect_thread_registers_ftype) (const struct regcache *,
ptid_t,
bfd *, char *, int *,
--
2.1.4