X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Famd64-linux-nat.c;h=09a4dfd731636be0f31f489ff9c7666259a9f4b2;hb=d4f3a0e91896a0aad797e221ba6876ba7f0cd05c;hp=23eadbd79c64b3e9336377e21daa2d49dda6ea72;hpb=ba224c70dd8ba8ab0aabe0c1ac9f98c7d832b024;p=platform%2Fupstream%2Fbinutils.git diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index 23eadbd..09a4dfd 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -1,6 +1,6 @@ /* Native-dependent code for GNU/Linux x86-64. - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2014 Free Software Foundation, Inc. Contributed by Jiri Smid, SuSE Labs. This file is part of GDB. @@ -20,59 +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 - -/* Per-thread arch-specific data we want to keep. */ - -struct arch_lwp_info -{ - /* Non-zero if our copy differs from what's recorded in the thread. */ - int debug_registers_changed; -}; +#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 @@ -97,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" */ }; @@ -161,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)) { @@ -183,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; @@ -216,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)) { @@ -242,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; @@ -270,170 +238,6 @@ amd64_linux_store_inferior_registers (struct target_ops *ops, } } -/* Support for debug registers. */ - -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); - - errno = 0; - value = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user, u_debugreg[regnum]), 0); - if (errno != 0) - perror_with_name (_("Couldn't read debug register")); - - 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")); -} - -/* Return the inferior's debug register REGNUM. */ - -static CORE_ADDR -amd64_linux_dr_get_addr (int regnum) -{ - /* DR6 and DR7 are retrieved with some other way. */ - gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR); - - return amd64_linux_dr_get (inferior_ptid, regnum); -} - -/* Return the inferior's DR7 debug control register. */ - -static unsigned long -amd64_linux_dr_get_control (void) -{ - return amd64_linux_dr_get (inferior_ptid, DR_CONTROL); -} - -/* 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); -} - -/* Callback for linux_nat_iterate_watchpoint_lwps. Update the debug registers - of LWP. */ - -static int -update_debug_registers_callback (struct lwp_info *lwp, void *arg) -{ - if (lwp->arch_private == NULL) - lwp->arch_private = XCNEW (struct arch_lwp_info); - - /* The actual update is done later just before resuming the lwp, we - just mark that the registers need updating. */ - lwp->arch_private->debug_registers_changed = 1; - - /* If the lwp isn't stopped, force it to momentarily pause, so we - can update its debug registers. */ - if (!lwp->stopped) - linux_stop_lwp (lwp); - - /* Continue the iteration. */ - return 0; -} - -/* Set DR_CONTROL to CONTROL in all LWPs of the current inferior. */ - -static void -amd64_linux_dr_set_control (unsigned long control) -{ - linux_nat_iterate_watchpoint_lwps (update_debug_registers_callback, NULL); -} - -/* Set address REGNUM (zero based) to ADDR in all LWPs of the current - inferior. */ - -static void -amd64_linux_dr_set_addr (int regnum, CORE_ADDR addr) -{ - gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR); - - linux_nat_iterate_watchpoint_lwps (update_debug_registers_callback, NULL); -} - -/* Called when resuming a thread. - If the debug regs have changed, update the thread's copies. */ - -static void -amd64_linux_prepare_to_resume (struct lwp_info *lwp) -{ - int clear_status = 0; - - /* NULL means this is the main thread still going through the shell, - or, no watchpoint has been set yet. In that case, there's - nothing to do. */ - if (lwp->arch_private == NULL) - return; - - if (lwp->arch_private->debug_registers_changed) - { - struct i386_debug_reg_state *state = i386_debug_reg_state (); - int i; - - /* On Linux kernel before 2.6.33 commit - 72f674d203cd230426437cdcf7dd6f681dad8b0d - if you enable a breakpoint by the DR_CONTROL bits you need to have - already written the corresponding DR_FIRSTADDR...DR_LASTADDR registers. - - Ensure DR_CONTROL gets written as the very last register here. */ - - for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++) - if (state->dr_ref_count[i] > 0) - { - amd64_linux_dr_set (lwp->ptid, i, state->dr_mirror[i]); - - /* If we're setting a watchpoint, any change the inferior - had done itself to the debug registers needs to be - discarded, otherwise, i386_stopped_data_address can get - confused. */ - clear_status = 1; - } - - amd64_linux_dr_set (lwp->ptid, DR_CONTROL, state->dr_control_mirror); - - lwp->arch_private->debug_registers_changed = 0; - } - - if (clear_status || lwp->stopped_by_watchpoint) - amd64_linux_dr_set (lwp->ptid, DR_STATUS, 0); -} - -static void -amd64_linux_new_thread (struct lwp_info *lp) -{ - struct arch_lwp_info *info = XCNEW (struct arch_lwp_info); - - info->debug_registers_changed = 1; - - lp->arch_private = info; -} - /* This function is called by libthread_db as part of its handling of a request for a thread's local storage address. */ @@ -442,28 +246,20 @@ ps_err_e ps_get_thread_area (const struct ps_prochandle *ph, lwpid_t lwpid, int idx, void **base) { - if (gdbarch_bfd_arch_info (target_gdbarch)->bits_per_word == 32) + if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 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; + 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 { @@ -479,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; @@ -494,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 @@ -948,106 +763,7 @@ amd64_linux_siginfo_fixup (siginfo_t *native, gdb_byte *inf, int direction) else return 0; } - -/* Get Linux/x86 target description from running target. - - Value of CS segment register: - 1. 64bit process: 0x33. - 2. 32bit process: 0x23. - - Value of DS segment register: - 1. LP64 process: 0x0. - 2. X32 process: 0x2b. - */ - -#define AMD64_LINUX_USER64_CS 0x33 -#define AMD64_LINUX_X32_DS 0x2b - -static const struct target_desc * -amd64_linux_read_description (struct target_ops *ops) -{ - unsigned long cs; - unsigned long ds; - int tid; - int is_64bit; - int is_x32; - 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; - - /* Get DS register. */ - errno = 0; - ds = ptrace (PTRACE_PEEKUSER, tid, - offsetof (struct user_regs_struct, ds), 0); - if (errno != 0) - perror_with_name (_("Couldn't get DS register")); - - is_x32 = ds == AMD64_LINUX_X32_DS; - - if (sizeof (void *) == 4 && is_64bit && !is_x32) - error (_("Can't debug 64-bit process with 32-bit GDB")); - - if (have_ptrace_getregset == -1) - { - uint64_t xstateregs[(I386_XSTATE_SSE_SIZE / sizeof (uint64_t))]; - struct iovec iov; - - 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; - else - { - have_ptrace_getregset = 1; - - /* 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) - { - if (is_x32) - return tdesc_x32_avx_linux; - else - return tdesc_amd64_avx_linux; - } - else - return tdesc_i386_avx_linux; - } - else - { - if (is_64bit) - { - if (is_x32) - return tdesc_x32_linux; - else - return tdesc_amd64_linux; - } - else - return tdesc_i386_linux; - } -} + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_amd64_linux_nat (void); @@ -1065,31 +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.get_addr = amd64_linux_dr_get_addr; - i386_dr_low.get_status = amd64_linux_dr_get_status; - i386_dr_low.get_control = amd64_linux_dr_get_control; - 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); - linux_nat_set_prepare_to_resume (t, amd64_linux_prepare_to_resume); }