aboutsummaryrefslogtreecommitdiff
path: root/gdb/gdbserver/win32-i386-low.c
diff options
context:
space:
mode:
authorYao Qi <yao.qi@linaro.org>2017-09-05 09:54:54 +0100
committerYao Qi <yao.qi@linaro.org>2017-09-05 09:54:54 +0100
commit22916b0786336394bf84f68ba71875ac3cd48fea (patch)
treed33017acd70368911aafd35d32af46f61c2a358d /gdb/gdbserver/win32-i386-low.c
parent0854b7b1878dc9f8b8519e2efed605acecc14745 (diff)
downloadgdb-22916b0786336394bf84f68ba71875ac3cd48fea.zip
gdb-22916b0786336394bf84f68ba71875ac3cd48fea.tar.gz
gdb-22916b0786336394bf84f68ba71875ac3cd48fea.tar.bz2
Convert the rest x86 target descriptions
This patch changes the rest of x86 target descriptions in GDB and GDBserver. gdb: 2017-09-05 Yao Qi <yao.qi@linaro.org> * amd64-tdep.c (amd64_target_description): Create target descriptions. (_initialize_amd64_tdep): Don't call functions initialize_tdesc_amd64_*. Add self tests. * arch/amd64.c (amd64_create_target_description): Add parameter is_linux. Call set_tdesc_osabi if is_linux is true. * arch/amd64.h (amd64_create_target_description): Update the declaration. * arch/i386.c (i386_create_target_description): Add parameter is_linux. Call set_tdesc_osabi if is_linux is true. * arch/i386.h (i386_create_target_description): Update declaration. * configure.tgt: Add i386.o to gdb_target_obs. * features/Makefile (XMLTOC): Remove i386/*.xml. * features/i386/amd64-avx-avx512.c: Remove. * features/i386/amd64-avx-mpx-avx512-pku.c: Remove. * features/i386/amd64-avx-mpx.c: Remove. * features/i386/amd64-avx.c: Remove. * features/i386/amd64-mpx.c: Remove. * features/i386/amd64.c: Remove. * features/i386/i386-avx-avx512.c: Remove. * features/i386/i386-avx-mpx-avx512-pku.c: Remove. * features/i386/i386-avx-mpx.c: Remove. * features/i386/i386-avx.c: Remove. * features/i386/i386-mmx.c: Remove. * features/i386/i386-mpx.c: Remove. * features/i386/i386.c: Remove. * i386-tdep.c: Don't include features/i386/i386*.c., include target-descriptions.h and arch/i386.h. (i386_target_description): Create target descriptions. (i386_gdbarch_init): Don't call initialize_tdesc_i386_* functions. Do self tests. gdb/gdbserver: 2017-09-05 Yao Qi <yao.qi@linaro.org> * configure.srv (srv_i386_regobj): Remove. (srv_amd64_regobj): Remove. (srv_regobj): Set it to "" for x86 non-linux targets. * linux-x86-tdesc.c (i386_linux_read_description): * lynx-i386-low.c: Include x86-xstate.h and arch/i386.h. (init_registers_i386): Remove the declaration. (tdesc_i386): Remove the declaration. (lynx_i386_arch_setup): Call i386_create_target_description. * nto-x86-low.c: Likewise. * win32-i386-low.c [__x86_64__]: include arch/amd64.h. [!__x86_64__]: include arch/i386.h. (i386_arch_setup) [__x86_64__]: Call amd64_create_target_description.
Diffstat (limited to 'gdb/gdbserver/win32-i386-low.c')
-rw-r--r--gdb/gdbserver/win32-i386-low.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 40bdf12..4361d82 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -18,6 +18,11 @@
#include "server.h"
#include "win32-low.h"
#include "x86-low.h"
+#include "x86-xstate.h"
+#ifdef __x86_64__
+#include "arch/amd64.h"
+#endif
+#include "arch/i386.h"
#ifndef CONTEXT_EXTENDED_REGISTERS
#define CONTEXT_EXTENDED_REGISTERS 0
@@ -28,16 +33,6 @@
#define FLAG_TRACE_BIT 0x100
-#ifdef __x86_64__
-/* Defined in auto-generated build-time file gdb/gdbserver/amd64.c. */
-void init_registers_amd64 (void);
-extern const struct target_desc *tdesc_amd64;
-#else
-/* Defined in auto-generated build-time file gdb/gdbserver/i386.c. */
-void init_registers_i386 (void);
-extern const struct target_desc *tdesc_i386;
-#endif
-
static struct x86_debug_reg_state debug_reg_state;
static int
@@ -449,11 +444,10 @@ static void
i386_arch_setup (void)
{
#ifdef __x86_64__
- init_registers_amd64 ();
- win32_tdesc = tdesc_amd64;
+ win32_tdesc = amd64_create_target_description (X86_XSTATE_SSE_MASK, false,
+ false);
#else
- init_registers_i386 ();
- win32_tdesc = tdesc_i386;
+ win32_tdesc = i386_create_target_description (X86_XSTATE_SSE_MASK, false);
#endif
}