X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Famd64-linux-nat.c;h=22a13593c8b4ed046ad7ff0e52abbb4ed67dce77;hb=4bfb94b8648cebad2683d24ebe033ef539df1dbb;hp=caf2e963060cce9d67f5c83c3f31bb2b32a6ccc3;hpb=4c38200f7dda423c701d01639596df606b96433c;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index caf2e96306..22a13593c8 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -1,7 +1,6 @@ /* Native-dependent code for GNU/Linux x86-64. - Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - 2011 Free Software Foundation, Inc. + Copyright (C) 2001-2015 Free Software Foundation, Inc. Contributed by Jiri Smid, SuSE Labs. This file is part of GDB. @@ -21,51 +20,23 @@ #include "defs.h" #include "inferior.h" -#include "gdbcore.h" #include "regcache.h" -#include "regset.h" -#include "linux-nat.h" -#include "amd64-linux-tdep.h" - -#include "gdb_assert.h" -#include "gdb_string.h" #include "elf/common.h" #include #include -#include -#include -#include #include -/* FIXME ezannoni-2003-07-09: we need to be included after - because the latter redefines FS and GS for no apparent - reason, and those definitions don't match the ones that libpthread_db - uses, which come from . */ -/* ezannoni-2003-07-09: I think this is fixed. The extraneous defs have - been removed from ptrace.h in the kernel. However, better safe than - sorry. */ -#include #include -#include "gdb_proc_service.h" - -/* Prototypes for supply_gregset etc. */ #include "gregset.h" +#include "gdb_proc_service.h" +#include "amd64-nat.h" +#include "linux-nat.h" #include "amd64-tdep.h" +#include "amd64-linux-tdep.h" #include "i386-linux-tdep.h" -#include "amd64-nat.h" -#include "i386-nat.h" -#include "i386-xstate.h" - -#ifndef PTRACE_GETREGSET -#define PTRACE_GETREGSET 0x4204 -#endif - -#ifndef PTRACE_SETREGSET -#define PTRACE_SETREGSET 0x4205 -#endif +#include "x86-xstate.h" -/* Does the current host support PTRACE_GETREGSET? */ -static int have_ptrace_getregset = -1; +#include "x86-linux-nat.h" /* Mapping between the general-purpose registers in GNU/Linux x86-64 `struct user' format and GDB's register cache layout for GNU/Linux @@ -90,7 +61,11 @@ static int amd64_linux_gregset32_reg_offset[] = -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - ORIG_RAX * 8 /* "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) */ + ORIG_RAX * 8 /* "orig_eax" */ }; @@ -154,9 +129,9 @@ amd64_linux_fetch_inferior_registers (struct target_ops *ops, int tid; /* GNU/Linux LWP ID's are process ID's. */ - tid = TIDGET (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); if (tid == 0) - tid = PIDGET (inferior_ptid); /* Not a threaded program. */ + tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum)) { @@ -176,7 +151,7 @@ amd64_linux_fetch_inferior_registers (struct target_ops *ops, if (have_ptrace_getregset) { - char xstateregs[I386_XSTATE_MAX_SIZE]; + char xstateregs[X86_XSTATE_MAX_SIZE]; struct iovec iov; iov.iov_base = xstateregs; @@ -209,9 +184,9 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, int tid; /* GNU/Linux LWP ID's are process ID's. */ - tid = TIDGET (inferior_ptid); + tid = ptid_get_lwp (inferior_ptid); if (tid == 0) - tid = PIDGET (inferior_ptid); /* Not a threaded program. */ + tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */ if (regnum == -1 || amd64_native_gregset_supplies_p (gdbarch, regnum)) { @@ -235,7 +210,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, if (have_ptrace_getregset) { - char xstateregs[I386_XSTATE_MAX_SIZE]; + char xstateregs[X86_XSTATE_MAX_SIZE]; struct iovec iov; iov.iov_base = xstateregs; @@ -263,127 +238,6 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, } } -/* Support for debug registers. */ - -static unsigned long amd64_linux_dr[DR_CONTROL + 1]; - -static unsigned long -amd64_linux_dr_get (ptid_t ptid, int regnum) -{ - int tid; - unsigned long value; - - tid = TIDGET (ptid); - if (tid == 0) - tid = PIDGET (ptid); - - /* FIXME: kettenis/2001-03-27: Calling perror_with_name if the - ptrace call fails breaks debugging remote targets. The correct - way to fix this is to add the hardware breakpoint and watchpoint - stuff to the target vector. For now, just return zero if the - ptrace call fails. */ - errno = 0; - value = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user, u_debugreg[regnum]), 0); - if (errno != 0) -#if 0 - perror_with_name (_("Couldn't read debug register")); -#else - return 0; -#endif - - return value; -} - -/* Set debug register REGNUM to VALUE in only the one LWP of PTID. */ - -static void -amd64_linux_dr_set (ptid_t ptid, int regnum, unsigned long value) -{ - int tid; - - tid = TIDGET (ptid); - if (tid == 0) - tid = PIDGET (ptid); - - errno = 0; - ptrace (PTRACE_POKEUSER, tid, - offsetof (struct user, u_debugreg[regnum]), value); - if (errno != 0) - perror_with_name (_("Couldn't write debug register")); -} - -/* Set DR_CONTROL to ADDR in all LWPs of LWP_LIST. */ - -static void -amd64_linux_dr_set_control (unsigned long control) -{ - struct lwp_info *lp; - - amd64_linux_dr[DR_CONTROL] = control; - ALL_LWPS (lp) - amd64_linux_dr_set (lp->ptid, DR_CONTROL, control); -} - -/* Set address REGNUM (zero based) to ADDR in all LWPs of LWP_LIST. */ - -static void -amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr) -{ - struct lwp_info *lp; - - gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR); - - amd64_linux_dr[DR_FIRSTADDR + regnum] = addr; - ALL_LWPS (lp) - amd64_linux_dr_set (lp->ptid, DR_FIRSTADDR + regnum, addr); -} - -/* Set address REGNUM (zero based) to zero in all LWPs of LWP_LIST. */ - -static void -amd64_linux_dr_reset_addr (int regnum) -{ - amd64_linux_dr_set_addr (regnum, 0); -} - -/* Get DR_STATUS from only the one LWP of INFERIOR_PTID. */ - -static unsigned long -amd64_linux_dr_get_status (void) -{ - return amd64_linux_dr_get (inferior_ptid, DR_STATUS); -} - -/* Unset MASK bits in DR_STATUS in all LWPs of LWP_LIST. */ - -static void -amd64_linux_dr_unset_status (unsigned long mask) -{ - struct lwp_info *lp; - - ALL_LWPS (lp) - { - unsigned long value; - - value = amd64_linux_dr_get (lp->ptid, DR_STATUS); - value &= ~mask; - amd64_linux_dr_set (lp->ptid, DR_STATUS, value); - } -} - - -static void -amd64_linux_new_thread (ptid_t ptid) -{ - int i; - - for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++) - amd64_linux_dr_set (ptid, i, amd64_linux_dr[i]); - - amd64_linux_dr_set (ptid, DR_CONTROL, amd64_linux_dr[DR_CONTROL]); -} - /* This function is called by libthread_db as part of its handling of a request for a thread's local storage address. */ @@ -392,28 +246,20 @@ ps_err_e ps_get_thread_area (const struct ps_prochandle *ph, lwpid_t lwpid, int idx, void **base) { - if (gdbarch_ptr_bit (target_gdbarch) == 32) - { - /* The full structure is found in . The second - integer is the LDT's base_address and that is used to locate - the thread's local storage. See i386-linux-nat.c more - info. */ - unsigned int desc[4]; - - /* This code assumes that "int" is 32 bits and that - GET_THREAD_AREA returns no more than 4 int values. */ - gdb_assert (sizeof (int) == 4); -#ifndef PTRACE_GET_THREAD_AREA -#define PTRACE_GET_THREAD_AREA 25 -#endif - if (ptrace (PTRACE_GET_THREAD_AREA, - lwpid, (void *) (long) idx, (unsigned long) &desc) < 0) - return PS_ERR; - - /* Extend the value to 64 bits. Here it's assumed that a "long" - and a "void *" are the same. */ - (*base) = (void *) (long) desc[1]; - return PS_OK; + if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32) + { + unsigned int base_addr; + ps_err_e result; + + result = x86_linux_get_thread_area (lwpid, (void *) (long) idx, + &base_addr); + if (result == PS_OK) + { + /* Extend the value to 64 bits. Here it's assumed that + a "long" and a "void *" are the same. */ + (*base) = (void *) (long) base_addr; + } + return result; } else { @@ -429,10 +275,39 @@ ps_get_thread_area (const struct ps_prochandle *ph, switch (idx) { case FS: +#ifdef HAVE_STRUCT_USER_REGS_STRUCT_FS_BASE + { + /* PTRACE_ARCH_PRCTL is obsolete since 2.6.25, where the + fs_base and gs_base fields of user_regs_struct can be + used directly. */ + unsigned long fs; + errno = 0; + fs = ptrace (PTRACE_PEEKUSER, lwpid, + offsetof (struct user_regs_struct, fs_base), 0); + if (errno == 0) + { + *base = (void *) fs; + return PS_OK; + } + } +#endif if (ptrace (PTRACE_ARCH_PRCTL, lwpid, base, ARCH_GET_FS) == 0) return PS_OK; break; case GS: +#ifdef HAVE_STRUCT_USER_REGS_STRUCT_GS_BASE + { + unsigned long gs; + errno = 0; + gs = ptrace (PTRACE_PEEKUSER, lwpid, + offsetof (struct user_regs_struct, gs_base), 0); + if (errno == 0) + { + *base = (void *) gs; + return PS_OK; + } + } +#endif if (ptrace (PTRACE_ARCH_PRCTL, lwpid, base, ARCH_GET_GS) == 0) return PS_OK; break; @@ -444,16 +319,6 @@ ps_get_thread_area (const struct ps_prochandle *ph, } -static void (*super_post_startup_inferior) (ptid_t ptid); - -static void -amd64_linux_child_post_startup_inferior (ptid_t ptid) -{ - i386_cleanup_dregs (); - super_post_startup_inferior (ptid); -} - - /* When GDB is built as a 64-bit application on linux, the PTRACE_GETSIGINFO data is always presented in 64-bit layout. Since debugging a 32-bit inferior with a 64-bit GDB should look the same @@ -541,6 +406,71 @@ typedef struct compat_siginfo } _sifields; } compat_siginfo_t; +/* For x32, clock_t in _sigchld is 64bit aligned at 4 bytes. */ +typedef struct compat_x32_clock +{ + int lower; + int upper; +} compat_x32_clock_t; + +typedef struct compat_x32_siginfo +{ + int si_signo; + int si_errno; + int si_code; + + union + { + int _pad[((128 / sizeof (int)) - 3)]; + + /* kill() */ + struct + { + unsigned int _pid; + unsigned int _uid; + } _kill; + + /* POSIX.1b timers */ + struct + { + compat_timer_t _tid; + int _overrun; + compat_sigval_t _sigval; + } _timer; + + /* POSIX.1b signals */ + struct + { + unsigned int _pid; + unsigned int _uid; + compat_sigval_t _sigval; + } _rt; + + /* SIGCHLD */ + struct + { + unsigned int _pid; + unsigned int _uid; + int _status; + compat_x32_clock_t _utime; + compat_x32_clock_t _stime; + } _sigchld; + + /* SIGILL, SIGFPE, SIGSEGV, SIGBUS */ + struct + { + unsigned int _addr; + } _sigfault; + + /* SIGPOLL */ + struct + { + int _band; + int _fd; + } _sigpoll; + } _sifields; +} compat_x32_siginfo_t; + #define cpt_si_pid _sifields._kill._pid #define cpt_si_uid _sifields._kill._uid #define cpt_si_timerid _sifields._timer._tid @@ -674,6 +604,124 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from) } } +static void +compat_x32_siginfo_from_siginfo (compat_x32_siginfo_t *to, + siginfo_t *from) +{ + memset (to, 0, sizeof (*to)); + + to->si_signo = from->si_signo; + to->si_errno = from->si_errno; + to->si_code = from->si_code; + + if (to->si_code == SI_TIMER) + { + to->cpt_si_timerid = from->si_timerid; + to->cpt_si_overrun = from->si_overrun; + to->cpt_si_ptr = (intptr_t) from->si_ptr; + } + else if (to->si_code == SI_USER) + { + to->cpt_si_pid = from->si_pid; + to->cpt_si_uid = from->si_uid; + } + else if (to->si_code < 0) + { + to->cpt_si_pid = from->si_pid; + to->cpt_si_uid = from->si_uid; + to->cpt_si_ptr = (intptr_t) from->si_ptr; + } + else + { + switch (to->si_signo) + { + case SIGCHLD: + to->cpt_si_pid = from->si_pid; + to->cpt_si_uid = from->si_uid; + to->cpt_si_status = from->si_status; + memcpy (&to->cpt_si_utime, &from->si_utime, + sizeof (to->cpt_si_utime)); + memcpy (&to->cpt_si_stime, &from->si_stime, + sizeof (to->cpt_si_stime)); + break; + case SIGILL: + case SIGFPE: + case SIGSEGV: + case SIGBUS: + to->cpt_si_addr = (intptr_t) from->si_addr; + break; + case SIGPOLL: + to->cpt_si_band = from->si_band; + to->cpt_si_fd = from->si_fd; + break; + default: + to->cpt_si_pid = from->si_pid; + to->cpt_si_uid = from->si_uid; + to->cpt_si_ptr = (intptr_t) from->si_ptr; + break; + } + } +} + +static void +siginfo_from_compat_x32_siginfo (siginfo_t *to, + compat_x32_siginfo_t *from) +{ + memset (to, 0, sizeof (*to)); + + to->si_signo = from->si_signo; + to->si_errno = from->si_errno; + to->si_code = from->si_code; + + if (to->si_code == SI_TIMER) + { + to->si_timerid = from->cpt_si_timerid; + to->si_overrun = from->cpt_si_overrun; + to->si_ptr = (void *) (intptr_t) from->cpt_si_ptr; + } + else if (to->si_code == SI_USER) + { + to->si_pid = from->cpt_si_pid; + to->si_uid = from->cpt_si_uid; + } + if (to->si_code < 0) + { + to->si_pid = from->cpt_si_pid; + to->si_uid = from->cpt_si_uid; + to->si_ptr = (void *) (intptr_t) from->cpt_si_ptr; + } + else + { + switch (to->si_signo) + { + case SIGCHLD: + to->si_pid = from->cpt_si_pid; + to->si_uid = from->cpt_si_uid; + to->si_status = from->cpt_si_status; + memcpy (&to->si_utime, &from->cpt_si_utime, + sizeof (to->si_utime)); + memcpy (&to->si_stime, &from->cpt_si_stime, + sizeof (to->si_stime)); + break; + case SIGILL: + case SIGFPE: + case SIGSEGV: + case SIGBUS: + to->si_addr = (void *) (intptr_t) from->cpt_si_addr; + break; + case SIGPOLL: + to->si_band = from->cpt_si_band; + to->si_fd = from->cpt_si_fd; + break; + default: + to->si_pid = from->cpt_si_pid; + to->si_uid = from->cpt_si_uid; + to->si_ptr = (void* ) (intptr_t) from->cpt_si_ptr; + break; + } + } +} + /* Convert a native/host siginfo object, into/from the siginfo in the layout of the inferiors' architecture. Returns true if any conversion was done; false otherwise. If DIRECTION is 1, then copy @@ -681,13 +729,15 @@ siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from) INF. */ static int -amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction) +amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction) { + struct gdbarch *gdbarch = get_frame_arch (get_current_frame ()); + /* Is the inferior 32-bit? If so, then do fixup the siginfo object. */ - if (gdbarch_addr_bit (get_frame_arch (get_current_frame ())) == 32) + if (gdbarch_bfd_arch_info (gdbarch)->bits_per_word == 32) { - gdb_assert (sizeof (struct siginfo) == sizeof (compat_siginfo_t)); + gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t)); if (direction == 0) compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native); @@ -696,80 +746,24 @@ amd64_linux_siginfo_fixup (struct siginfo *native, gdb_byte *inf, int direction) return 1; } - else - return 0; -} - -/* Get Linux/x86 target description from running target. - - Value of CS segment register: - 1. 64bit process: 0x33. - 2. 32bit process: 0x23. - */ - -#define AMD64_LINUX_USER64_CS 0x33 - -static const struct target_desc * -amd64_linux_read_description (struct target_ops *ops) -{ - unsigned long cs; - int tid; - int is_64bit; - static uint64_t xcr0; - - /* GNU/Linux LWP ID's are process ID's. */ - tid = TIDGET (inferior_ptid); - if (tid == 0) - tid = PIDGET (inferior_ptid); /* Not a threaded program. */ - - /* Get CS register. */ - errno = 0; - cs = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user_regs_struct, cs), 0); - if (errno != 0) - perror_with_name (_("Couldn't get CS register")); - - is_64bit = cs == AMD64_LINUX_USER64_CS; - - if (have_ptrace_getregset == -1) + /* No fixup for native x32 GDB. */ + else if (gdbarch_addr_bit (gdbarch) == 32 && sizeof (void *) == 8) { - uint64_t xstateregs[(I386_XSTATE_SSE_SIZE / sizeof (uint64_t))]; - struct iovec iov; + gdb_assert (sizeof (siginfo_t) == sizeof (compat_x32_siginfo_t)); - iov.iov_base = xstateregs; - iov.iov_len = sizeof (xstateregs); - - /* Check if PTRACE_GETREGSET works. */ - if (ptrace (PTRACE_GETREGSET, tid, - (unsigned int) NT_X86_XSTATE, (long) &iov) < 0) - have_ptrace_getregset = 0; + if (direction == 0) + compat_x32_siginfo_from_siginfo ((struct compat_x32_siginfo *) inf, + native); else - { - have_ptrace_getregset = 1; + siginfo_from_compat_x32_siginfo (native, + (struct compat_x32_siginfo *) inf); - /* Get XCR0 from XSAVE extended state. */ - xcr0 = xstateregs[(I386_LINUX_XSAVE_XCR0_OFFSET - / sizeof (uint64_t))]; - } - } - - /* Check the native XCR0 only if PTRACE_GETREGSET is available. */ - if (have_ptrace_getregset - && (xcr0 & I386_XSTATE_AVX_MASK) == I386_XSTATE_AVX_MASK) - { - if (is_64bit) - return tdesc_amd64_avx_linux; - else - return tdesc_i386_avx_linux; + return 1; } else - { - if (is_64bit) - return tdesc_amd64_linux; - else - return tdesc_i386_linux; - } + return 0; } + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_amd64_linux_nat (void); @@ -787,30 +781,16 @@ _initialize_amd64_linux_nat (void) gdb_assert (ARRAY_SIZE (amd64_linux_gregset32_reg_offset) == amd64_native_gregset32_num_regs); - /* Fill in the generic GNU/Linux methods. */ - t = linux_target (); - - i386_use_watchpoints (t); - - i386_dr_low.set_control = amd64_linux_dr_set_control; - i386_dr_low.set_addr = amd64_linux_dr_set_addr; - i386_dr_low.reset_addr = amd64_linux_dr_reset_addr; - i386_dr_low.get_status = amd64_linux_dr_get_status; - i386_dr_low.unset_status = amd64_linux_dr_unset_status; - i386_set_debug_register_length (8); - - /* Override the GNU/Linux inferior startup hook. */ - super_post_startup_inferior = t->to_post_startup_inferior; - t->to_post_startup_inferior = amd64_linux_child_post_startup_inferior; + /* Create a generic x86 GNU/Linux target. */ + t = x86_linux_create_target (); /* Add our register access methods. */ t->to_fetch_registers = amd64_linux_fetch_inferior_registers; t->to_store_registers = amd64_linux_store_inferior_registers; - t->to_read_description = amd64_linux_read_description; + /* Add the target. */ + x86_linux_add_target (t); - /* Register the target. */ - linux_nat_add_target (t); - linux_nat_set_new_thread (t, amd64_linux_new_thread); + /* Add our siginfo layout converter. */ linux_nat_set_siginfo_fixup (t, amd64_linux_siginfo_fixup); }