X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fi386-linux-tdep.c;h=0f10686bc0145804cc470fc6aa6b074c9a2d42b7;hb=f81e7e2db6d1aaf47561e54356aee12b585533c2;hp=8cec6753f060a85be6dcd3a2767d7854a8d032df;hpb=c2508e905f956c5a5e0d2a7fff58b4c746180237;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 8cec6753f0..0f10686bc0 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-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -38,7 +38,7 @@ #include "xml-syscall.h" #include "i387-tdep.h" -#include "x86-xstate.h" +#include "gdbsupport/x86-xstate.h" /* The syscall's XML filename for i386. */ #define XML_SYSCALL_FILENAME_I386 "syscalls/i386-linux.xml" @@ -402,7 +402,7 @@ i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch, if (!i386_mpx_enabled ()) return; - TRY + try { /* Sigcode evaluates if the actual segfault is a boundary violation. */ sig_code = parse_and_eval_long ("$_siginfo.si_code\n"); @@ -414,11 +414,10 @@ i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch, access = parse_and_eval_long ("$_siginfo._sifields._sigfault.si_addr"); } - CATCH (exception, RETURN_MASK_ALL) + catch (const gdb_exception &exception) { return; } - END_CATCH /* If this is not a boundary violation just return. */ if (sig_code != SIG_CODE_BONDARY_FAULT) @@ -433,13 +432,13 @@ i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch, uiout->field_string ("sigcode-meaning", _("Lower bound violation")); uiout->text (_(" while accessing address ")); - uiout->field_fmt ("bound-access", "%s", paddress (gdbarch, access)); + uiout->field_core_addr ("bound-access", gdbarch, access); uiout->text (_("\nBounds: [lower = ")); - uiout->field_fmt ("lower-bound", "%s", paddress (gdbarch, lower_bound)); + uiout->field_core_addr ("lower-bound", gdbarch, lower_bound); uiout->text (_(", upper = ")); - uiout->field_fmt ("upper-bound", "%s", paddress (gdbarch, upper_bound)); + uiout->field_core_addr ("upper-bound", gdbarch, upper_bound); uiout->text (_("]")); } @@ -537,7 +536,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]; @@ -547,7 +546,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); @@ -559,9 +558,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); } @@ -647,7 +646,7 @@ i386_linux_core_read_xcr0 (bfd *abfd) if (xstate) { - size_t size = bfd_section_size (abfd, xstate); + size_t size = bfd_section_size (xstate); /* Check extended state size. */ if (size < X86_XSTATE_AVX_SIZE) @@ -694,7 +693,7 @@ i386_linux_read_description (uint64_t xcr0) [(xcr0 & X86_XSTATE_PKRU) ? 1 : 0]; if (*tdesc == NULL) - *tdesc = i386_create_target_description (xcr0, true); + *tdesc = i386_create_target_description (xcr0, true, false); return *tdesc; } @@ -764,16 +763,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 @@ -802,21 +802,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) { /* The closure returned by i386_displaced_step_copy_insn is simply a - buffer with a copy of the instruction. */ - gdb_byte *insn = (gdb_byte *) closure; + 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 @@ -1035,7 +1035,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->i386_sysenter_record = i386_linux_intx80_sysenter_syscall_record; tdep->i386_syscall_record = i386_linux_intx80_sysenter_syscall_record; - /* N_FUN symbols in shared libaries have 0 for their values and need + /* N_FUN symbols in shared libraries have 0 for their values and need to be relocated. */ set_gdbarch_sofun_address_maybe_missing (gdbarch, 1); @@ -1081,28 +1081,4 @@ _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 */ }