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  <yao.qi@linaro.org>

	* 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.
This commit is contained in:
Yao Qi 2017-09-04 11:33:56 +01:00
parent 0860c437cb
commit 2434b0199d
10 changed files with 34 additions and 10 deletions

View File

@ -1,3 +1,16 @@
2017-09-04 Yao Qi <yao.qi@linaro.org>
* 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 <simon.marchi@ericsson.com>
* btrace.h (btrace_insn_s, DEF_VEC_O (btrace_insn_s)): Remove.

View File

@ -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;

View File

@ -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);
}

View File

@ -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;
}

View File

@ -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;

View File

@ -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;

View File

@ -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. */

View File

@ -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;

View File

@ -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);

View File

@ -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);