diff options
author | Yao Qi <yao.qi@linaro.org> | 2017-09-05 09:54:53 +0100 |
---|---|---|
committer | Yao Qi <yao.qi@linaro.org> | 2017-09-05 09:54:53 +0100 |
commit | 5f035c0716c3b6b310a736841b16088d984be917 (patch) | |
tree | 16b38d34949029002402750d155ed37cd4458a7e /gdb/gdbserver/linux-x86-tdesc.c | |
parent | 0abe8a8992948559d225ff120095e42a1a6a36f4 (diff) | |
download | fsf-binutils-gdb-5f035c0716c3b6b310a736841b16088d984be917.zip fsf-binutils-gdb-5f035c0716c3b6b310a736841b16088d984be917.tar.gz fsf-binutils-gdb-5f035c0716c3b6b310a736841b16088d984be917.tar.bz2 |
Share i386-linux target description between GDB and GDBserver
The code on creating i386-linux target descriptions are quite similar
between GDB and GDBserver, so this patch moves them into a shared file
arch/i386.c. I didn't name it as i386-linux.c, because I want to reuse it
to create other i386 non-linux target descriptions later.
gdb:
2017-09-05 Yao Qi <yao.qi@linaro.org>
* Makefile.in (ALL_TARGET_OBS): Add i386.o.
(SFILES): Add arch/i386.c.
(HFILES_NO_SRCDIR): Add arch/i386.h.
* arch/i386.c: New file.
* arch/i386.h: New file.
* arch/tdesc.h (allocate_target_description): Declare.
(set_tdesc_architecture): Declare.
(set_tdesc_osabi): Declare.
* configure.tgt (i[34567]86-*-linux*): Add i386.o.
* i386-linux-tdep.c: Don't include ../features/i386/32bit-XXX.c.
include arch/i386.h.
(i386_linux_read_description): Remove code and call
i386_create_target_description.
(set_tdesc_architecture): New function.
(set_tdesc_osabi): New function.
* target-descriptions.h (allocate_target_description): Remove.
gdb/gdbserver:
2017-09-05 Yao Qi <yao.qi@linaro.org>
* Makefile.in (arch-i386.o): New rule.
* configure.srv (i[34567]86-*-linux*): Add arch-i386.o.
(x86_64-*-linux*): Likewise.
* linux-x86-tdesc.c: Don't include ../features/i386/32bit-XXX.c,
include arch/i386.h.
(i386_linux_read_description): Remove code and call
i386_create_target_description.
* tdesc.c (allocate_target_description): New function.
* tdesc.h (set_tdesc_architecture): Remove declaration.
(set_tdesc_osabi): Likewise.
Diffstat (limited to 'gdb/gdbserver/linux-x86-tdesc.c')
-rw-r--r-- | gdb/gdbserver/linux-x86-tdesc.c | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c index 3f63d8e..548e780 100644 --- a/gdb/gdbserver/linux-x86-tdesc.c +++ b/gdb/gdbserver/linux-x86-tdesc.c @@ -20,16 +20,10 @@ #include "server.h" #include "tdesc.h" #include "linux-x86-tdesc.h" -#include "x86-xstate.h" +#include "arch/i386.h" +#include "common/x86-xstate.h" #if defined __i386__ || !defined IN_PROCESS_AGENT -#include "../features/i386/32bit-core.c" -#include "../features/i386/32bit-linux.c" -#include "../features/i386/32bit-sse.c" -#include "../features/i386/32bit-avx.c" -#include "../features/i386/32bit-avx512.c" -#include "../features/i386/32bit-mpx.c" -#include "../features/i386/32bit-pkeys.c" /* Defined in auto-generated file i386-linux.c. */ void init_registers_i386_linux (void); @@ -142,34 +136,7 @@ i386_linux_read_description (uint64_t xcr0) if (*tdesc == NULL) { - *tdesc = new target_desc (); - -#ifndef IN_PROCESS_AGENT - set_tdesc_architecture (*tdesc, "i386"); - set_tdesc_osabi (*tdesc, "GNU/Linux"); -#endif - - long regnum = 0; - - if (xcr0 & X86_XSTATE_X87) - regnum = create_feature_i386_32bit_core (*tdesc, regnum); - - if (xcr0 & X86_XSTATE_SSE) - regnum = create_feature_i386_32bit_sse (*tdesc, regnum); - - regnum = create_feature_i386_32bit_linux (*tdesc, regnum); - - if (xcr0 & X86_XSTATE_AVX) - regnum = create_feature_i386_32bit_avx (*tdesc, regnum); - - if (xcr0 & X86_XSTATE_MPX) - regnum = create_feature_i386_32bit_mpx (*tdesc, regnum); - - if (xcr0 & X86_XSTATE_AVX512) - regnum = create_feature_i386_32bit_avx512 (*tdesc, regnum); - - if (xcr0 & X86_XSTATE_PKRU) - regnum = create_feature_i386_32bit_pkeys (*tdesc, regnum); + *tdesc = i386_create_target_description (xcr0); init_target_desc (*tdesc); |