From 35b4818d03e8d63a926afb235a21c2cb64b14b23 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Wed, 26 Jul 2017 12:36:42 +0100 Subject: [PATCH] Centralize i386 linux target descriptions This patch moves all the tdesc_i386*_linux target descriptions to a function i386_linux_read_description, which returns the right target description according to xcr0. This also remove the duplication in getting target descriptions in corefile and native target. gdb: 2017-07-26 Yao Qi * i386-linux-tdep.c (i386_linux_read_description): New function. (i386_linux_core_read_description): Call i386_linux_read_description. * i386-linux-tdep.h (i386_linux_read_description): Declare. (tdesc_i386_linux, tdesc_i386_mmx_linux): Remove declarations. (tdesc_i386_avx_linux, tdesc_i386_mpx_linux): Likewise (tdesc_i386_avx_mpx_linux, tdesc_i386_avx_avx512_linux): Likewise. (tdesc_i386_avx_mpx_avx512_pku_linux): Likewise. * x86-linux-nat.c (x86_linux_read_description): Call i386_linux_read_description. --- gdb/ChangeLog | 13 +++++++++++++ gdb/i386-linux-tdep.c | 34 +++++++++++++++++++++++----------- gdb/i386-linux-tdep.h | 10 ++-------- gdb/x86-linux-nat.c | 24 ++++++++---------------- 4 files changed, 46 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 05072ce93b..d42ba8e603 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2017-07-26 Yao Qi + + * i386-linux-tdep.c (i386_linux_read_description): New function. + (i386_linux_core_read_description): Call + i386_linux_read_description. + * i386-linux-tdep.h (i386_linux_read_description): Declare. + (tdesc_i386_linux, tdesc_i386_mmx_linux): Remove declarations. + (tdesc_i386_avx_linux, tdesc_i386_mpx_linux): Likewise + (tdesc_i386_avx_mpx_linux, tdesc_i386_avx_avx512_linux): Likewise. + (tdesc_i386_avx_mpx_avx512_pku_linux): Likewise. + * x86-linux-nat.c (x86_linux_read_description): Call + i386_linux_read_description. + 2017-07-26 Yao Qi * NEWS: Mention it. diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index d381e41c14..e986d6feaa 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -678,16 +678,11 @@ i386_linux_core_read_xcr0 (bfd *abfd) return xcr0; } -/* Get Linux/x86 target description from core dump. */ +/* See i386-linux-tdep.h. */ -static const struct target_desc * -i386_linux_core_read_description (struct gdbarch *gdbarch, - struct target_ops *target, - bfd *abfd) +const struct target_desc * +i386_linux_read_description (uint64_t xcr0) { - /* Linux/i386. */ - uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); - switch ((xcr0 & X86_XSTATE_ALL_MASK)) { case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: @@ -708,10 +703,27 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, break; } + return NULL; +} + +/* Get Linux/x86 target description from core dump. */ + +static const struct target_desc * +i386_linux_core_read_description (struct gdbarch *gdbarch, + struct target_ops *target, + bfd *abfd) +{ + /* Linux/i386. */ + uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); + const struct target_desc *tdesc = i386_linux_read_description (xcr0); + + if (tdesc != NULL) + return tdesc; + if (bfd_get_section_by_name (abfd, ".reg-xfp") != NULL) - return tdesc_i386_linux; + return i386_linux_read_description (X86_XSTATE_SSE_MASK); else - return tdesc_i386_mmx_linux; + return i386_linux_read_description (X86_XSTATE_X87_MASK); } /* Similar to i386_supply_fpregset, but use XSAVE extended state. */ @@ -835,7 +847,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_num_regs (gdbarch, I386_LINUX_NUM_REGS); if (! tdesc_has_registers (tdesc)) - tdesc = tdesc_i386_linux; + tdesc = i386_linux_read_description (X86_XSTATE_SSE_MASK); tdep->tdesc = tdesc; feature = tdesc_find_feature (tdesc, "org.gnu.gdb.i386.linux"); diff --git a/gdb/i386-linux-tdep.h b/gdb/i386-linux-tdep.h index 8d4c7caa5a..1ca8d6b815 100644 --- a/gdb/i386-linux-tdep.h +++ b/gdb/i386-linux-tdep.h @@ -42,14 +42,8 @@ extern uint64_t i386_linux_core_read_xcr0 (bfd *abfd); extern void i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch, struct ui_out *uiout); -/* Linux target description. */ -extern struct target_desc *tdesc_i386_linux; -extern struct target_desc *tdesc_i386_mmx_linux; -extern struct target_desc *tdesc_i386_avx_linux; -extern struct target_desc *tdesc_i386_mpx_linux; -extern struct target_desc *tdesc_i386_avx_mpx_linux; -extern struct target_desc *tdesc_i386_avx_avx512_linux; -extern struct target_desc *tdesc_i386_avx_mpx_avx512_pku_linux; +/* Return the target description according to XCR0. */ +extern const struct target_desc *i386_linux_read_description (uint64_t xcr0); /* Format of XSAVE extended state is: struct diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 7362282cbc..2c4afb1f4b 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -153,7 +153,7 @@ x86_linux_read_description (struct target_ops *ops) { have_ptrace_getfpxregs = 0; have_ptrace_getregset = TRIBOOL_FALSE; - return tdesc_i386_mmx_linux; + return i386_linux_read_description (X86_XSTATE_X87_MASK); } } #endif @@ -230,21 +230,13 @@ x86_linux_read_description (struct target_ops *ops) } else { - switch (xcr0_features_bits) - { - case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: - return tdesc_i386_avx_mpx_avx512_pku_linux; - case X86_XSTATE_AVX_AVX512_MASK: - return tdesc_i386_avx_avx512_linux; - case X86_XSTATE_MPX_MASK: - return tdesc_i386_mpx_linux; - case X86_XSTATE_AVX_MPX_MASK: - return tdesc_i386_avx_mpx_linux; - case X86_XSTATE_AVX_MASK: - return tdesc_i386_avx_linux; - default: - return tdesc_i386_linux; - } + const struct target_desc * tdesc + = i386_linux_read_description (xcr0_features_bits); + + if (tdesc == NULL) + tdesc = i386_linux_read_description (X86_XSTATE_SSE_MASK); + + return tdesc; } gdb_assert_not_reached ("failed to return tdesc"); -- 2.34.1