diff options
author | Yao Qi <yao.qi@linaro.org> | 2017-06-07 23:00:27 +0100 |
---|---|---|
committer | Yao Qi <yao.qi@linaro.org> | 2017-08-21 11:18:15 +0100 |
commit | 7bb6fd1451c12d30ea950e7507fa7b84b7b14e6c (patch) | |
tree | 352dced26a2e2986d93a2baa1d25c5e83ffcc813 | |
parent | 14f2d00f0e225e8b798d59f62465dfb4d6b37595 (diff) | |
download | binutils-gdb-7bb6fd1451c12d30ea950e7507fa7b84b7b14e6c.tar.gz |
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-06-07 Yao Qi <yao.qi@linaro.org>
* 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.
-rw-r--r-- | gdb/amd64-linux-tdep.c | 46 | ||||
-rw-r--r-- | gdb/amd64-linux-tdep.h | 6 | ||||
-rw-r--r-- | gdb/x86-linux-nat.c | 35 |
3 files changed, 35 insertions, 52 deletions
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c index 54c2eb9fdc4..85efbefd128 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 74534085a0b..ab134a45f8d 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 2c4afb1f4bd..46115270581 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 |