From: Yao Qi Date: Mon, 4 Sep 2017 10:33:56 +0000 (+0100) Subject: Use amd64_target_description to get tdesc_amd64 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2434b0199ddcd9419c55742552953b0a79d00ebc;p=binutils-gdb.git Use amd64_target_description to get tdesc_amd64 This patch changes amd64-*-tdep.c files to use function amd64_target_description to get the right target description rather than use the variable tdesd_amd64. gdb: 2017-09-04 Yao Qi * amd64-darwin-tdep.c: Include "x86-xstate.h". (x86_darwin_init_abi_64): Call amd64_target_description. * amd64-dicos-tdep.c: Likewise. * amd64-fbsd-nat.c: Likewise. * amd64-fbsd-tdep.c: Likewise. * amd64-nbsd-tdep.c: Likewise. * amd64-obsd-tdep.c: Likewise. * amd64-sol2-tdep.c: Likewise. * amd64-windows-tdep.c: Likewise. * amd64-tdep.h (tdesc_amd64): Remove the declaration. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 09d38e3ae1d..af4284d2f90 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2017-09-04 Yao Qi + + * amd64-darwin-tdep.c: Include "x86-xstate.h". + (x86_darwin_init_abi_64): Call amd64_target_description. + * amd64-dicos-tdep.c: Likewise. + * amd64-fbsd-nat.c: Likewise. + * amd64-fbsd-tdep.c: Likewise. + * amd64-nbsd-tdep.c: Likewise. + * amd64-obsd-tdep.c: Likewise. + * amd64-sol2-tdep.c: Likewise. + * amd64-windows-tdep.c: Likewise. + * amd64-tdep.h (tdesc_amd64): Remove the declaration. + 2017-09-04 Simon Marchi * btrace.h (btrace_insn_s, DEF_VEC_O (btrace_insn_s)): Remove. diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c index be26d9e3c4b..81dba82102a 100644 --- a/gdb/amd64-darwin-tdep.c +++ b/gdb/amd64-darwin-tdep.c @@ -29,6 +29,7 @@ #include "objfiles.h" #include "i387-tdep.h" +#include "x86-xstate.h" #include "amd64-tdep.h" #include "osabi.h" #include "ui-out.h" @@ -99,7 +100,8 @@ x86_darwin_init_abi_64 (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); tdep->struct_return = reg_struct_return; diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c index 7bdb167e82d..d319dd928f2 100644 --- a/gdb/amd64-dicos-tdep.c +++ b/gdb/amd64-dicos-tdep.c @@ -20,12 +20,14 @@ #include "defs.h" #include "osabi.h" #include "amd64-tdep.h" +#include "x86-xstate.h" #include "dicos-tdep.h" static void amd64_dicos_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); dicos_init_abi (gdbarch); } diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c index 1fe0d56b3a8..f3ddbdd3d92 100644 --- a/gdb/amd64-fbsd-nat.c +++ b/gdb/amd64-fbsd-nat.c @@ -179,7 +179,7 @@ amd64fbsd_read_description (struct target_ops *ops) } #endif if (is64) - return tdesc_amd64; + return amd64_target_description (X86_XSTATE_SSE_MASK); else return tdesc_i386; } diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c index ad4d787998d..897cab945f6 100644 --- a/gdb/amd64-fbsd-tdep.c +++ b/gdb/amd64-fbsd-tdep.c @@ -217,7 +217,8 @@ amd64fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64fbsd_r_reg_offset); tdep->sizeof_gregset = 22 * 8; - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); tdep->sigtramp_p = amd64fbsd_sigtramp_p; tdep->sigtramp_start = amd64fbsd_sigtramp_start_addr; diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c index 02bf42776e1..9ae022729f6 100644 --- a/gdb/amd64-nbsd-tdep.c +++ b/gdb/amd64-nbsd-tdep.c @@ -25,6 +25,7 @@ #include "symtab.h" #include "amd64-tdep.h" +#include "x86-xstate.h" #include "nbsd-tdep.h" #include "solib-svr4.h" @@ -103,7 +104,8 @@ amd64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64nbsd_r_reg_offset); tdep->sizeof_gregset = 26 * 8; - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); tdep->jb_pc_offset = 7 * 8; diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c index ad90c20b5af..54942cc7158 100644 --- a/gdb/amd64-obsd-tdep.c +++ b/gdb/amd64-obsd-tdep.c @@ -32,6 +32,7 @@ #include "obsd-tdep.h" #include "amd64-tdep.h" #include "i387-tdep.h" +#include "x86-xstate.h" #include "solib-svr4.h" #include "bsd-uthread.h" @@ -419,7 +420,8 @@ amd64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); obsd_init_abi (info, gdbarch); /* Initialize general-purpose register set details. */ diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c index ca474db8b2e..1ae2edc6333 100644 --- a/gdb/amd64-sol2-tdep.c +++ b/gdb/amd64-sol2-tdep.c @@ -28,6 +28,7 @@ #include "sol2-tdep.h" #include "amd64-tdep.h" +#include "x86-xstate.h" #include "solib-svr4.h" /* Mapping between the general-purpose registers in gregset_t format @@ -99,7 +100,8 @@ amd64_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (amd64_sol2_gregset_reg_offset); tdep->sizeof_gregset = 28 * 8; - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); tdep->sigtramp_p = amd64_sol2_sigtramp_p; tdep->sigcontext_addr = amd64_sol2_mcontext_addr; diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h index 23fa5b84309..047af3f0744 100644 --- a/gdb/amd64-tdep.h +++ b/gdb/amd64-tdep.h @@ -87,8 +87,6 @@ enum amd64_regnum #define AMD64_NUM_REGS (AMD64_GSBASE_REGNUM + 1) -extern struct target_desc *tdesc_amd64; - extern struct displaced_step_closure *amd64_displaced_step_copy_insn (struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to, struct regcache *regs); diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index 9158282cf9a..5ac73bd8c97 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -18,6 +18,7 @@ #include "defs.h" #include "osabi.h" #include "amd64-tdep.h" +#include "x86-xstate.h" #include "gdbtypes.h" #include "gdbcore.h" #include "regcache.h" @@ -1224,7 +1225,8 @@ amd64_windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) */ frame_unwind_append_unwinder (gdbarch, &amd64_windows_frame_unwind); - amd64_init_abi (info, gdbarch, tdesc_amd64); + amd64_init_abi (info, gdbarch, + amd64_target_description (X86_XSTATE_SSE_MASK)); windows_init_abi (info, gdbarch);