From 9d3d478be5e21151d3755d7b2e6f1cd8ff92d726 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 5 Sep 2017 09:54:53 +0100 Subject: [PATCH] Centralize amd64-linux target descriptions This patch adds a new function amd64_linux_read_description, which creates amd64-linux target descriptions according to its two arguments, xcr0 and is_x32. gdb: 2017-09-05 Yao Qi * amd64-linux-tdep.c (amd64_linux_read_description): New function. (amd64_linux_core_read_description): Call amd64_linux_read_description. (amd64_linux_init_abi): Likewise. (amd64_x32_linux_init_abi): Likewise. * amd64-linux-tdep.h (amd64_linux_read_description): Declare. * x86-linux-nat.c (x86_linux_read_description): Call amd64_linux_read_description. --- gdb/ChangeLog | 12 ++++++++++++ gdb/amd64-linux-tdep.c | 46 ++++++++++++++++++++++++++++------------------ gdb/amd64-linux-tdep.h | 6 ++++++ gdb/x86-linux-nat.c | 35 +---------------------------------- 4 files changed, 47 insertions(+), 52 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f7f69fd..b17e48b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2017-09-05 Yao Qi + * amd64-linux-tdep.c (amd64_linux_read_description): New + function. + (amd64_linux_core_read_description): Call + amd64_linux_read_description. + (amd64_linux_init_abi): Likewise. + (amd64_x32_linux_init_abi): Likewise. + * amd64-linux-tdep.h (amd64_linux_read_description): Declare. + * x86-linux-nat.c (x86_linux_read_description): Call + amd64_linux_read_description. + +2017-09-05 Yao Qi + * amd64-linux-tdep.c (amd64_linux_core_read_description): Update comments. diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 54c2eb9..85efbef 100644 --- a/gdb/amd64-linux-tdep.c +++ b/gdb/amd64-linux-tdep.c @@ -1575,54 +1575,61 @@ amd64_linux_record_signal (struct gdbarch *gdbarch, return 0; } -/* Get Linux/x86 target description from core dump. */ - -static const struct target_desc * -amd64_linux_core_read_description (struct gdbarch *gdbarch, - struct target_ops *target, - bfd *abfd) +const target_desc * +amd64_linux_read_description (uint64_t xcr0_features_bit, bool is_x32) { - /* Linux/x86-64. */ - uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); - - switch (xcr0 & X86_XSTATE_ALL_MASK) + switch (xcr0_features_bit) { case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) /* No MPX, PKU on x32, fallback to AVX-AVX512. */ return tdesc_x32_avx_avx512_linux; else return tdesc_amd64_avx_mpx_avx512_pku_linux; case X86_XSTATE_AVX_AVX512_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) return tdesc_x32_avx_avx512_linux; else return tdesc_amd64_avx_avx512_linux; case X86_XSTATE_MPX_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) /* No MPX on x32, fallback to AVX. */ return tdesc_x32_avx_linux; else return tdesc_amd64_mpx_linux; case X86_XSTATE_AVX_MPX_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) /* No MPX on x32, fallback to AVX. */ return tdesc_x32_avx_linux; else return tdesc_amd64_avx_mpx_linux; case X86_XSTATE_AVX_MASK: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) return tdesc_x32_avx_linux; else return tdesc_amd64_avx_linux; default: - if (gdbarch_ptr_bit (gdbarch) == 32) + if (is_x32) return tdesc_x32_linux; else return tdesc_amd64_linux; } } +/* Get Linux/x86 target description from core dump. */ + +static const struct target_desc * +amd64_linux_core_read_description (struct gdbarch *gdbarch, + struct target_ops *target, + bfd *abfd) +{ + /* Linux/x86-64. */ + uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); + + return amd64_linux_read_description (xcr0 & X86_XSTATE_ALL_MASK, + gdbarch_ptr_bit (gdbarch) == 32); +} + /* Similar to amd64_supply_fpregset, but use XSAVE extended state. */ static void @@ -1873,7 +1880,8 @@ amd64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset); tdep->sizeof_gregset = 27 * 8; - amd64_init_abi (info, gdbarch, tdesc_amd64_linux); + amd64_init_abi (info, gdbarch, + amd64_linux_read_description (X86_XSTATE_SSE_MASK, false)); const target_desc *tdesc = tdep->tdesc; @@ -2086,7 +2094,9 @@ amd64_x32_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64_linux_gregset_reg_offset); tdep->sizeof_gregset = 27 * 8; - amd64_x32_init_abi (info, gdbarch, tdesc_x32_linux); + amd64_x32_init_abi (info, gdbarch, + amd64_linux_read_description (X86_XSTATE_SSE_MASK, + true)); /* Reserve a number for orig_rax. */ set_gdbarch_num_regs (gdbarch, AMD64_LINUX_NUM_REGS); diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h index 7453408..ab134a4 100644 --- a/gdb/amd64-linux-tdep.h +++ b/gdb/amd64-linux-tdep.h @@ -43,6 +43,12 @@ extern struct target_desc *tdesc_x32_linux; extern struct target_desc *tdesc_x32_avx_linux; extern struct target_desc *tdesc_x32_avx_avx512_linux; +/* Return the right amd64-linux target descriptions according to + XCR0_FEATURES_BIT and IS_X32. */ + +const target_desc *amd64_linux_read_description (uint64_t xcr0_features_bit, + bool is_x32); + /* Enum that defines the syscall identifiers for amd64 linux. Used for process record/replay, these will be translated into a gdb-canonical set of syscall ids in linux-record.c. */ diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c index 2c4afb1..4611527 100644 --- a/gdb/x86-linux-nat.c +++ b/gdb/x86-linux-nat.c @@ -192,40 +192,7 @@ x86_linux_read_description (struct target_ops *ops) if (is_64bit) { #ifdef __x86_64__ - switch (xcr0_features_bits) - { - case X86_XSTATE_AVX_MPX_AVX512_PKU_MASK: - if (is_x32) - /* No MPX, PKU on x32, fall back to AVX-AVX512. */ - return tdesc_x32_avx_avx512_linux; - else - return tdesc_amd64_avx_mpx_avx512_pku_linux; - case X86_XSTATE_AVX_AVX512_MASK: - if (is_x32) - return tdesc_x32_avx_avx512_linux; - else - return tdesc_amd64_avx_avx512_linux; - case X86_XSTATE_MPX_MASK: - if (is_x32) - return tdesc_x32_avx_linux; /* No MPX on x32 using AVX. */ - else - return tdesc_amd64_mpx_linux; - case X86_XSTATE_AVX_MPX_MASK: - if (is_x32) - return tdesc_x32_avx_linux; /* No MPX on x32 using AVX. */ - else - return tdesc_amd64_avx_mpx_linux; - case X86_XSTATE_AVX_MASK: - if (is_x32) - return tdesc_x32_avx_linux; - else - return tdesc_amd64_avx_linux; - default: - if (is_x32) - return tdesc_x32_linux; - else - return tdesc_amd64_linux; - } + return amd64_linux_read_description (xcr0_features_bits, is_x32); #endif } else -- 2.7.4