X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fi386-linux-tdep.c;h=802c41fe7257aea18a0dba46896aa7e6a33fd81f;hb=e98ee8c458f3a8405eb93e71b00f801b4bbe3635;hp=4c0f597a689b60ddb8e5b4197f9660d56b6d5241;hpb=ea03d0d3c32b22aeddfeb139a4a515f7e5961347;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 4c0f597a68..802c41fe72 100644 --- a/gdb/i386-linux-tdep.c +++ b/gdb/i386-linux-tdep.c @@ -1,6 +1,6 @@ /* Target-dependent code for GNU/Linux i386. - Copyright (C) 2000-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2018 Free Software Foundation, Inc. This file is part of GDB. @@ -46,13 +46,8 @@ #include "record-full.h" #include "linux-record.h" -#include "features/i386/32bit-core.c" -#include "features/i386/32bit-sse.c" -#include "features/i386/32bit-linux.c" -#include "features/i386/32bit-avx.c" -#include "features/i386/32bit-mpx.c" -#include "features/i386/32bit-avx512.c" -#include "features/i386/32bit-pkeys.c" +#include "arch/i386.h" +#include "target-descriptions.h" /* Return non-zero, when the register is in the corresponding register group. Put the LINUX_ORIG_EAX register in the system group. */ @@ -542,7 +537,7 @@ i386_linux_record_signal (struct gdbarch *gdbarch, static LONGEST i386_linux_get_syscall_number_from_regcache (struct regcache *regcache) { - struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch *gdbarch = regcache->arch (); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); /* The content of a register. */ gdb_byte buf[4]; @@ -552,7 +547,7 @@ i386_linux_get_syscall_number_from_regcache (struct regcache *regcache) /* Getting the system call number from the register. When dealing with x86 architecture, this information is stored at %eax register. */ - regcache_cooked_read (regcache, I386_LINUX_ORIG_EAX_REGNUM, buf); + regcache->cooked_read (I386_LINUX_ORIG_EAX_REGNUM, buf); ret = extract_signed_integer (buf, 4, byte_order); @@ -564,9 +559,9 @@ i386_linux_get_syscall_number_from_regcache (struct regcache *regcache) static LONGEST i386_linux_get_syscall_number (struct gdbarch *gdbarch, - ptid_t ptid) + thread_info *thread) { - struct regcache *regcache = get_thread_regcache (ptid); + struct regcache *regcache = get_thread_regcache (thread); return i386_linux_get_syscall_number_from_regcache (regcache); } @@ -699,33 +694,7 @@ i386_linux_read_description (uint64_t xcr0) [(xcr0 & X86_XSTATE_PKRU) ? 1 : 0]; if (*tdesc == NULL) - { - *tdesc = allocate_target_description (); - set_tdesc_architecture (*tdesc, bfd_scan_arch ("i386")); - set_tdesc_osabi (*tdesc, osabi_from_tdesc_string ("GNU/Linux")); - - 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, true); return *tdesc; } @@ -795,16 +764,17 @@ i386_linux_iterate_over_regset_sections (struct gdbarch *gdbarch, { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); - cb (".reg", 68, &i386_gregset, NULL, cb_data); + cb (".reg", 68, 68, &i386_gregset, NULL, cb_data); if (tdep->xcr0 & X86_XSTATE_AVX) cb (".reg-xstate", X86_XSTATE_SIZE (tdep->xcr0), - &i386_linux_xstateregset, "XSAVE extended state", cb_data); + X86_XSTATE_SIZE (tdep->xcr0), &i386_linux_xstateregset, + "XSAVE extended state", cb_data); else if (tdep->xcr0 & X86_XSTATE_SSE) - cb (".reg-xfp", 512, &i386_fpregset, "extended floating-point", + cb (".reg-xfp", 512, 512, &i386_fpregset, "extended floating-point", cb_data); else - cb (".reg2", 108, &i386_fpregset, NULL, cb_data); + cb (".reg2", 108, 108, &i386_fpregset, NULL, cb_data); } /* Linux kernel shows PC value after the 'int $0x80' instruction even if @@ -833,21 +803,21 @@ i386_linux_displaced_step_copy_insn (struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to, struct regcache *regs) { - struct displaced_step_closure *closure; - - closure = i386_displaced_step_copy_insn (gdbarch, from, to, regs); + displaced_step_closure *closure_ + = i386_displaced_step_copy_insn (gdbarch, from, to, regs); if (i386_linux_get_syscall_number_from_regcache (regs) != -1) { - /* Since we use simple_displaced_step_copy_insn, our closure is a - copy of the instruction. */ - gdb_byte *insn = (gdb_byte *) closure; + /* The closure returned by i386_displaced_step_copy_insn is simply a + buffer with a copy of the instruction. */ + i386_displaced_step_closure *closure + = (i386_displaced_step_closure *) closure_; /* Fake nop. */ - insn[0] = 0x90; + closure->buf[0] = 0x90; } - return closure; + return closure_; } static void @@ -855,8 +825,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); const struct target_desc *tdesc = info.target_desc; - struct tdesc_arch_data *tdesc_data - = (struct tdesc_arch_data *) info.tdep_info; + struct tdesc_arch_data *tdesc_data = info.tdesc_data; const struct tdesc_feature *feature; int valid_p; @@ -1108,12 +1077,33 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_handle_segmentation_fault); } -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern void _initialize_i386_linux_tdep (void); - void _initialize_i386_linux_tdep (void) { gdbarch_register_osabi (bfd_arch_i386, 0, GDB_OSABI_LINUX, i386_linux_init_abi); + +#if GDB_SELF_TEST + struct + { + const char *xml; + uint64_t mask; + } xml_masks[] = { + { "i386/i386-linux.xml", X86_XSTATE_SSE_MASK }, + { "i386/i386-mmx-linux.xml", X86_XSTATE_X87_MASK }, + { "i386/i386-avx-linux.xml", X86_XSTATE_AVX_MASK }, + { "i386/i386-mpx-linux.xml", X86_XSTATE_MPX_MASK }, + { "i386/i386-avx-mpx-linux.xml", X86_XSTATE_AVX_MPX_MASK }, + { "i386/i386-avx-avx512-linux.xml", X86_XSTATE_AVX_AVX512_MASK }, + { "i386/i386-avx-mpx-avx512-pku-linux.xml", + X86_XSTATE_AVX_MPX_AVX512_PKU_MASK }, + }; + + for (auto &a : xml_masks) + { + auto tdesc = i386_linux_read_description (a.mask); + + selftests::record_xml_tdesc (a.xml, tdesc); + } +#endif /* GDB_SELF_TEST */ }