X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fi386-linux-tdep.c;h=c2f23e5f38d0e561629e0d39d40a5b305b1d8c7e;hb=112e8700a6fd2fed65ca70132c9cbed4132e8bd4;hp=61800b42ae2694966ea7b5ff641cf14cead07f00;hpb=2c02bd729076b940958bccf68f1cc0b1ecf8403b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index 61800b42ae..c2f23e5f38 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-2005, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2000-2016 Free Software Foundation, Inc. This file is part of GDB. @@ -27,11 +27,10 @@ #include "osabi.h" #include "reggroups.h" #include "dwarf2-frame.h" -#include "gdb_string.h" - #include "i386-tdep.h" #include "i386-linux-tdep.h" #include "linux-tdep.h" +#include "utils.h" #include "glibc-tdep.h" #include "solib-svr4.h" #include "symtab.h" @@ -39,40 +38,19 @@ #include "xml-syscall.h" #include "i387-tdep.h" -#include "i386-xstate.h" +#include "x86-xstate.h" /* The syscall's XML filename for i386. */ #define XML_SYSCALL_FILENAME_I386 "syscalls/i386-linux.xml" -#include "record.h" +#include "record-full.h" #include "linux-record.h" -#include - #include "features/i386/i386-linux.c" #include "features/i386/i386-mmx-linux.c" +#include "features/i386/i386-mpx-linux.c" +#include "features/i386/i386-avx-mpx-linux.c" #include "features/i386/i386-avx-linux.c" - -/* Supported register note sections. */ -static struct core_regset_section i386_linux_regset_sections[] = -{ - { ".reg", 68, "general-purpose" }, - { ".reg2", 108, "floating-point" }, - { NULL, 0 } -}; - -static struct core_regset_section i386_linux_sse_regset_sections[] = -{ - { ".reg", 68, "general-purpose" }, - { ".reg-xfp", 512, "extended floating-point" }, - { NULL, 0 } -}; - -static struct core_regset_section i386_linux_avx_regset_sections[] = -{ - { ".reg", 68, "general-purpose" }, - { ".reg-xstate", I386_XSTATE_MAX_SIZE, "XSAVE extended state" }, - { NULL, 0 } -}; +#include "features/i386/i386-avx512-linux.c" /* Return non-zero, when the register is in the corresponding register group. Put the LINUX_ORIG_EAX register in the system group. */ @@ -370,23 +348,23 @@ i386_linux_write_pc (struct regcache *regcache, CORE_ADDR pc) static int i386_all_but_ip_registers_record (struct regcache *regcache) { - if (record_arch_list_add_reg (regcache, I386_EAX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EAX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_ECX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_ECX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EDX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EDX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EBX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EBX_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_ESP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_ESP_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EBP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EBP_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_ESI_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_ESI_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EDI_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EDI_REGNUM)) return -1; - if (record_arch_list_add_reg (regcache, I386_EFLAGS_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EFLAGS_REGNUM)) return -1; return 0; @@ -403,9 +381,70 @@ i386_canonicalize_syscall (int syscall) enum { i386_syscall_max = 499 }; if (syscall <= i386_syscall_max) - return syscall; + return (enum gdb_syscall) syscall; else - return -1; + return gdb_sys_no_syscall; +} + +/* Value of the sigcode in case of a boundary fault. */ + +#define SIG_CODE_BONDARY_FAULT 3 + +/* i386 GNU/Linux implementation of the handle_segmentation_fault + gdbarch hook. Displays information related to MPX bound + violations. */ +void +i386_linux_handle_segmentation_fault (struct gdbarch *gdbarch, + struct ui_out *uiout) +{ + /* -Wmaybe-uninitialized */ + CORE_ADDR lower_bound = 0, upper_bound = 0, access = 0; + int is_upper; + long sig_code = 0; + + if (!i386_mpx_enabled ()) + return; + + TRY + { + /* Sigcode evaluates if the actual segfault is a boundary violation. */ + sig_code = parse_and_eval_long ("$_siginfo.si_code\n"); + + lower_bound + = parse_and_eval_long ("$_siginfo._sifields._sigfault._addr_bnd._lower"); + upper_bound + = parse_and_eval_long ("$_siginfo._sifields._sigfault._addr_bnd._upper"); + access + = parse_and_eval_long ("$_siginfo._sifields._sigfault.si_addr"); + } + CATCH (exception, RETURN_MASK_ALL) + { + return; + } + END_CATCH + + /* If this is not a boundary violation just return. */ + if (sig_code != SIG_CODE_BONDARY_FAULT) + return; + + is_upper = (access > upper_bound ? 1 : 0); + + uiout->text ("\n"); + if (is_upper) + uiout->field_string ("sigcode-meaning", _("Upper bound violation")); + else + uiout->field_string ("sigcode-meaning", _("Lower bound violation")); + + uiout->text (_(" while accessing address ")); + uiout->field_fmt ("bound-access", "%s", paddress (gdbarch, access)); + + uiout->text (_("\nBounds: [lower = ")); + uiout->field_fmt ("lower-bound", "%s", paddress (gdbarch, lower_bound)); + + uiout->text (_(", upper = ")); + uiout->field_fmt ("upper-bound", "%s", paddress (gdbarch, upper_bound)); + + uiout->text (_("]")); } /* Parse the arguments of current system call instruction and record @@ -418,7 +457,7 @@ i386_canonicalize_syscall (int syscall) static struct linux_record_tdep i386_linux_record_tdep; static int -i386_linux_intx80_sysenter_record (struct regcache *regcache) +i386_linux_intx80_sysenter_syscall_record (struct regcache *regcache) { int ret; LONGEST syscall_native; @@ -450,7 +489,7 @@ i386_linux_intx80_sysenter_record (struct regcache *regcache) return ret; /* Record the return value of the system call. */ - if (record_arch_list_add_reg (regcache, I386_EAX_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EAX_REGNUM)) return -1; return 0; @@ -459,17 +498,17 @@ i386_linux_intx80_sysenter_record (struct regcache *regcache) #define I386_LINUX_xstate 270 #define I386_LINUX_frame_size 732 -int +static int i386_linux_record_signal (struct gdbarch *gdbarch, struct regcache *regcache, - enum target_signal signal) + enum gdb_signal signal) { ULONGEST esp; if (i386_all_but_ip_registers_record (regcache)) return -1; - if (record_arch_list_add_reg (regcache, I386_EIP_REGNUM)) + if (record_full_arch_list_add_reg (regcache, I386_EIP_REGNUM)) return -1; /* Record the change in the stack. */ @@ -480,22 +519,28 @@ i386_linux_record_signal (struct gdbarch *gdbarch, /* This is for frame_size. sp -= sizeof (struct rt_sigframe); */ esp -= I386_LINUX_frame_size; - if (record_arch_list_add_mem (esp, - I386_LINUX_xstate + I386_LINUX_frame_size)) + if (record_full_arch_list_add_mem (esp, + I386_LINUX_xstate + I386_LINUX_frame_size)) return -1; - if (record_arch_list_add_end ()) + if (record_full_arch_list_add_end ()) return -1; return 0; } +/* Core of the implementation for gdbarch get_syscall_number. Get pending + syscall number from REGCACHE. If there is no pending syscall -1 will be + returned. Pending syscall means ptrace has stepped into the syscall but + another ptrace call will step out. PC is right after the int $0x80 + / syscall / sysenter instruction in both cases, PC does not change during + the second ptrace step. */ + static LONGEST -i386_linux_get_syscall_number (struct gdbarch *gdbarch, - ptid_t ptid) +i386_linux_get_syscall_number_from_regcache (struct regcache *regcache) { - struct regcache *regcache = get_thread_regcache (ptid); + struct gdbarch *gdbarch = get_regcache_arch (regcache); enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); /* The content of a register. */ gdb_byte buf[4]; @@ -512,6 +557,18 @@ i386_linux_get_syscall_number (struct gdbarch *gdbarch, return ret; } +/* Wrapper for i386_linux_get_syscall_number_from_regcache to make it + compatible with gdbarch get_syscall_number method prototype. */ + +static LONGEST +i386_linux_get_syscall_number (struct gdbarch *gdbarch, + ptid_t ptid) +{ + struct regcache *regcache = get_thread_regcache (ptid); + + return i386_linux_get_syscall_number_from_regcache (regcache); +} + /* The register sets used in GNU/Linux ELF core-dumps are identical to the register sets in `struct user' that are used for a.out core-dumps. These are also used by ptrace(2). The corresponding @@ -551,7 +608,11 @@ int i386_linux_gregset_reg_offset[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 11 * 4 /* "orig_eax" */ + -1, -1, -1, -1, /* MPX registers BND0 ... BND3. */ + -1, -1, /* MPX registers BNDCFGU, BNDSTATUS. */ + -1, -1, -1, -1, -1, -1, -1, -1, /* k0 ... k7 (AVX512) */ + -1, -1, -1, -1, -1, -1, -1, -1, /* zmm0 ... zmm7 (AVX512) */ + 11 * 4, /* "orig_eax" */ }; /* Mapping between the general-purpose registers in `struct @@ -581,8 +642,7 @@ static int i386_linux_sc_reg_offset[] = /* Get XSAVE extended state xcr0 from core dump. */ uint64_t -i386_linux_core_read_xcr0 (struct gdbarch *gdbarch, - struct target_ops *target, bfd *abfd) +i386_linux_core_read_xcr0 (bfd *abfd) { asection *xstate = bfd_get_section_by_name (abfd, ".reg-xstate"); uint64_t xcr0; @@ -592,8 +652,8 @@ i386_linux_core_read_xcr0 (struct gdbarch *gdbarch, size_t size = bfd_section_size (abfd, xstate); /* Check extended state size. */ - if (size < I386_XSTATE_AVX_SIZE) - xcr0 = I386_XSTATE_SSE_MASK; + if (size < X86_XSTATE_AVX_SIZE) + xcr0 = X86_XSTATE_SSE_MASK; else { char contents[8]; @@ -624,14 +684,22 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, bfd *abfd) { /* Linux/i386. */ - uint64_t xcr0 = i386_linux_core_read_xcr0 (gdbarch, target, abfd); - switch ((xcr0 & I386_XSTATE_AVX_MASK)) + uint64_t xcr0 = i386_linux_core_read_xcr0 (abfd); + + switch ((xcr0 & X86_XSTATE_ALL_MASK)) { - case I386_XSTATE_AVX_MASK: + case X86_XSTATE_MPX_AVX512_MASK: + case X86_XSTATE_AVX512_MASK: + return tdesc_i386_avx512_linux; + case X86_XSTATE_MPX_MASK: + return tdesc_i386_mpx_linux; + case X86_XSTATE_AVX_MPX_MASK: + return tdesc_i386_avx_mpx_linux; + case X86_XSTATE_AVX_MASK: return tdesc_i386_avx_linux; - case I386_XSTATE_SSE_MASK: + case X86_XSTATE_SSE_MASK: return tdesc_i386_linux; - case I386_XSTATE_X87_MASK: + case X86_XSTATE_X87_MASK: return tdesc_i386_mmx_linux; default: break; @@ -643,12 +711,113 @@ i386_linux_core_read_description (struct gdbarch *gdbarch, return tdesc_i386_mmx_linux; } +/* Similar to i386_supply_fpregset, but use XSAVE extended state. */ + +static void +i386_linux_supply_xstateregset (const struct regset *regset, + struct regcache *regcache, int regnum, + const void *xstateregs, size_t len) +{ + i387_supply_xsave (regcache, regnum, xstateregs); +} + +struct type * +x86_linux_get_siginfo_type (struct gdbarch *gdbarch) +{ + return linux_get_siginfo_type_with_fields (gdbarch, LINUX_SIGINFO_FIELD_ADDR_BND); +} + +/* Similar to i386_collect_fpregset, but use XSAVE extended state. */ + +static void +i386_linux_collect_xstateregset (const struct regset *regset, + const struct regcache *regcache, + int regnum, void *xstateregs, size_t len) +{ + i387_collect_xsave (regcache, regnum, xstateregs, 1); +} + +/* Register set definitions. */ + +static const struct regset i386_linux_xstateregset = + { + NULL, + i386_linux_supply_xstateregset, + i386_linux_collect_xstateregset + }; + +/* Iterate over core file register note sections. */ + +static void +i386_linux_iterate_over_regset_sections (struct gdbarch *gdbarch, + iterate_over_regset_sections_cb *cb, + void *cb_data, + const struct regcache *regcache) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + cb (".reg", 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); + else if (tdep->xcr0 & X86_XSTATE_SSE) + cb (".reg-xfp", 512, &i386_fpregset, "extended floating-point", + cb_data); + else + cb (".reg2", 108, &i386_fpregset, NULL, cb_data); +} + +/* Linux kernel shows PC value after the 'int $0x80' instruction even if + inferior is still inside the syscall. On next PTRACE_SINGLESTEP it will + finish the syscall but PC will not change. + + Some vDSOs contain 'int $0x80; ret' and during stepping out of the syscall + i386_displaced_step_fixup would keep PC at the displaced pad location. + As PC is pointing to the 'ret' instruction before the step + i386_displaced_step_fixup would expect inferior has just executed that 'ret' + and PC should not be adjusted. In reality it finished syscall instead and + PC should get relocated back to its vDSO address. Hide the 'ret' + instruction by 'nop' so that i386_displaced_step_fixup is not confused. + + It is not fully correct as the bytes in struct displaced_step_closure will + not match the inferior code. But we would need some new flag in + displaced_step_closure otherwise to keep the state that syscall is finishing + for the later i386_displaced_step_fixup execution as the syscall execution + is already no longer detectable there. The new flag field would mean + i386-linux-tdep.c needs to wrap all the displacement methods of i386-tdep.c + which does not seem worth it. The same effect is achieved by patching that + 'nop' instruction there instead. */ + +static struct displaced_step_closure * +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); + + 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; + + /* Fake nop. */ + insn[0] = 0x90; + } + + return closure; +} + static void 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 = (void *) info.tdep_info; + struct tdesc_arch_data *tdesc_data + = (struct tdesc_arch_data *) info.tdep_info; const struct tdesc_feature *feature; int valid_p; @@ -708,8 +877,8 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_record_tdep.size_flock = 16; i386_linux_record_tdep.size_oldold_utsname = 45; i386_linux_record_tdep.size_ustat = 20; - i386_linux_record_tdep.size_old_sigaction = 140; - i386_linux_record_tdep.size_old_sigset_t = 128; + i386_linux_record_tdep.size_old_sigaction = 16; + i386_linux_record_tdep.size_old_sigset_t = 4; i386_linux_record_tdep.size_rlimit = 8; i386_linux_record_tdep.size_rusage = 72; i386_linux_record_tdep.size_timeval = 8; @@ -717,8 +886,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_record_tdep.size_old_gid_t = 2; i386_linux_record_tdep.size_old_uid_t = 2; i386_linux_record_tdep.size_fd_set = 128; - i386_linux_record_tdep.size_dirent = 268; - i386_linux_record_tdep.size_dirent64 = 276; + i386_linux_record_tdep.size_old_dirent = 268; i386_linux_record_tdep.size_statfs = 64; i386_linux_record_tdep.size_statfs64 = 84; i386_linux_record_tdep.size_sockaddr = 16; @@ -745,15 +913,15 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_record_tdep.size_NFS_FHSIZE = 32; i386_linux_record_tdep.size_knfsd_fh = 132; i386_linux_record_tdep.size_TASK_COMM_LEN = 16; - i386_linux_record_tdep.size_sigaction = 140; + i386_linux_record_tdep.size_sigaction = 20; i386_linux_record_tdep.size_sigset_t = 8; i386_linux_record_tdep.size_siginfo_t = 128; i386_linux_record_tdep.size_cap_user_data_t = 12; i386_linux_record_tdep.size_stack_t = 12; i386_linux_record_tdep.size_off_t = i386_linux_record_tdep.size_long; i386_linux_record_tdep.size_stat64 = 96; - i386_linux_record_tdep.size_gid_t = 2; - i386_linux_record_tdep.size_uid_t = 2; + i386_linux_record_tdep.size_gid_t = 4; + i386_linux_record_tdep.size_uid_t = 4; i386_linux_record_tdep.size_PAGE_SIZE = 4096; i386_linux_record_tdep.size_flock64 = 24; i386_linux_record_tdep.size_user_desc = 16; @@ -763,7 +931,6 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_record_tdep.size_itimerspec = i386_linux_record_tdep.size_timespec * 2; i386_linux_record_tdep.size_mq_attr = 32; - i386_linux_record_tdep.size_siginfo = 128; i386_linux_record_tdep.size_termios = 36; i386_linux_record_tdep.size_termios2 = 44; i386_linux_record_tdep.size_pid_t = 4; @@ -773,6 +940,7 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_record_tdep.size_hayes_esp_config = 12; i386_linux_record_tdep.size_size_t = 4; i386_linux_record_tdep.size_iovec = 8; + i386_linux_record_tdep.size_time_t = 4; /* These values are the second argument of system call "sys_ioctl". They are obtained from Linux Kernel source. */ @@ -856,8 +1024,9 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) i386_linux_record_tdep.arg5 = I386_EDI_REGNUM; i386_linux_record_tdep.arg6 = I386_EBP_REGNUM; - tdep->i386_intx80_record = i386_linux_intx80_sysenter_record; - tdep->i386_sysenter_record = i386_linux_intx80_sysenter_record; + tdep->i386_intx80_record = i386_linux_intx80_sysenter_syscall_record; + 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 to be relocated. */ @@ -877,32 +1046,29 @@ i386_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_fetch_tls_load_module_address (gdbarch, svr4_fetch_objfile_link_map); - /* Install supported register note sections. */ - if (tdesc_find_feature (tdesc, "org.gnu.gdb.i386.avx")) - set_gdbarch_core_regset_sections (gdbarch, i386_linux_avx_regset_sections); - else if (tdesc_find_feature (tdesc, "org.gnu.gdb.i386.sse")) - set_gdbarch_core_regset_sections (gdbarch, i386_linux_sse_regset_sections); - else - set_gdbarch_core_regset_sections (gdbarch, i386_linux_regset_sections); - + /* Core file support. */ + set_gdbarch_iterate_over_regset_sections + (gdbarch, i386_linux_iterate_over_regset_sections); set_gdbarch_core_read_description (gdbarch, i386_linux_core_read_description); /* Displaced stepping. */ set_gdbarch_displaced_step_copy_insn (gdbarch, - i386_displaced_step_copy_insn); + i386_linux_displaced_step_copy_insn); set_gdbarch_displaced_step_fixup (gdbarch, i386_displaced_step_fixup); set_gdbarch_displaced_step_free_closure (gdbarch, simple_displaced_step_free_closure); set_gdbarch_displaced_step_location (gdbarch, - displaced_step_at_entry_point); + linux_displaced_step_location); /* Functions for 'catch syscall'. */ - set_xml_syscall_file_name (XML_SYSCALL_FILENAME_I386); + set_xml_syscall_file_name (gdbarch, XML_SYSCALL_FILENAME_I386); set_gdbarch_get_syscall_number (gdbarch, i386_linux_get_syscall_number); - set_gdbarch_get_siginfo_type (gdbarch, linux_get_siginfo_type); + set_gdbarch_get_siginfo_type (gdbarch, x86_linux_get_siginfo_type); + set_gdbarch_handle_segmentation_fault (gdbarch, + i386_linux_handle_segmentation_fault); } /* Provide a prototype to silence -Wmissing-prototypes. */ @@ -918,4 +1084,7 @@ _initialize_i386_linux_tdep (void) initialize_tdesc_i386_linux (); initialize_tdesc_i386_mmx_linux (); initialize_tdesc_i386_avx_linux (); + initialize_tdesc_i386_mpx_linux (); + initialize_tdesc_i386_avx_mpx_linux (); + initialize_tdesc_i386_avx512_linux (); }