X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gdb%2Fi386-linux-nat.c;h=b95b47e7bb7dc59791de95155e30a2bb0799c06f;hb=003ea5a89ab7e9eaa65cb158a953d63dac2612c6;hp=a8d81fb173ac7d6f6190d8cda3b1412552e67a7e;hpb=a0eaec95753c0f093f5cb80080ef423030d35edd;p=platform%2Fupstream%2Fgdb.git
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index a8d81fb..b95b47e 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -1,6 +1,6 @@
/* Native-dependent code for GNU/Linux i386.
- Copyright (C) 1999-2014 Free Software Foundation, Inc.
+ Copyright (C) 1999-2015 Free Software Foundation, Inc.
This file is part of GDB.
@@ -18,67 +18,22 @@
along with this program. If not, see . */
#include "defs.h"
-#include "i386-nat.h"
#include "inferior.h"
#include "gdbcore.h"
#include "regcache.h"
-#include "regset.h"
-#include "target.h"
-#include "linux-nat.h"
-#include "linux-btrace.h"
-#include "btrace.h"
-
-#include "gdb_assert.h"
-#include
#include "elf/common.h"
-#include
#include
-#include
-#include
-
-#ifdef HAVE_SYS_REG_H
-#include
-#endif
-
-#ifndef ORIG_EAX
-#define ORIG_EAX -1
-#endif
-
-#ifdef HAVE_SYS_DEBUGREG_H
-#include
-#endif
-
-/* Prototypes for supply_gregset etc. */
+#include
#include "gregset.h"
+#include "gdb_proc_service.h"
+#include "i386-linux-nat.h"
#include "i387-tdep.h"
#include "i386-tdep.h"
#include "i386-linux-tdep.h"
+#include "x86-xstate.h"
-/* Defines ps_err_e, struct ps_prochandle. */
-#include "gdb_proc_service.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;
-};
-
-/* Does the current host support PTRACE_GETREGSET? */
-static int have_ptrace_getregset = -1;
-
+#include "x86-linux-nat.h"
/* The register sets used in GNU/Linux ELF core-dumps are identical to
the register sets in `struct user' that is used for a.out
@@ -367,7 +322,7 @@ store_fpregs (const struct regcache *regcache, int tid, int regno)
static int
fetch_xstateregs (struct regcache *regcache, int tid)
{
- char xstateregs[I386_XSTATE_MAX_SIZE];
+ char xstateregs[X86_XSTATE_MAX_SIZE];
struct iovec iov;
if (!have_ptrace_getregset)
@@ -390,7 +345,7 @@ fetch_xstateregs (struct regcache *regcache, int tid)
static int
store_xstateregs (const struct regcache *regcache, int tid, int regno)
{
- char xstateregs[I386_XSTATE_MAX_SIZE];
+ char xstateregs[X86_XSTATE_MAX_SIZE];
struct iovec iov;
if (!have_ptrace_getregset)
@@ -642,249 +597,22 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
}
-/* Support for debug registers. */
-
-/* Get debug register REGNUM value from only the one LWP of PTID. */
-
-static unsigned long
-i386_linux_dr_get (ptid_t ptid, int regnum)
-{
- int tid;
- unsigned long value;
-
- tid = ptid_get_lwp (ptid);
- if (tid == 0)
- tid = ptid_get_pid (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
-i386_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
-{
- int tid;
-
- tid = ptid_get_lwp (ptid);
- if (tid == 0)
- tid = ptid_get_pid (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
-i386_linux_dr_get_addr (int regnum)
-{
- /* DR6 and DR7 are retrieved with some other way. */
- gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
-
- return i386_linux_dr_get (inferior_ptid, regnum);
-}
-
-/* Return the inferior's DR7 debug control register. */
-
-static unsigned long
-i386_linux_dr_get_control (void)
-{
- return i386_linux_dr_get (inferior_ptid, DR_CONTROL);
-}
-
-/* Get DR_STATUS from only the one LWP of INFERIOR_PTID. */
-
-static unsigned long
-i386_linux_dr_get_status (void)
-{
- return i386_linux_dr_get (inferior_ptid, DR_STATUS);
-}
-
-/* Callback for iterate_over_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 ADDR in all LWPs of the current inferior. */
-
-static void
-i386_linux_dr_set_control (unsigned long control)
-{
- ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
-
- iterate_over_lwps (pid_ptid, update_debug_registers_callback, NULL);
-}
-
-/* Set address REGNUM (zero based) to ADDR in all LWPs of the current
- inferior. */
-
-static void
-i386_linux_dr_set_addr (int regnum, CORE_ADDR addr)
-{
- ptid_t pid_ptid = pid_to_ptid (ptid_get_pid (inferior_ptid));
-
- gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR);
-
- iterate_over_lwps (pid_ptid, update_debug_registers_callback, NULL);
-}
-
-/* Called when resuming a thread.
- If the debug regs have changed, update the thread's copies. */
-
-static void
-i386_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 (ptid_get_pid (lwp->ptid));
- int i;
-
- /* See amd64_linux_prepare_to_resume for Linux kernel note on
- i386_linux_dr_set calls ordering. */
-
- i386_linux_dr_set (lwp->ptid, DR_CONTROL, 0);
-
- for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++)
- if (state->dr_ref_count[i] > 0)
- {
- i386_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;
- }
-
- if (state->dr_control_mirror != 0)
- i386_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)
- i386_linux_dr_set (lwp->ptid, DR_STATUS, 0);
-}
-
-static void
-i386_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;
-}
-
-/* linux_nat_new_fork hook. */
-
-static void
-i386_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
-{
- pid_t parent_pid;
- struct i386_debug_reg_state *parent_state;
- struct i386_debug_reg_state *child_state;
-
- /* NULL means no watchpoint has ever been set in the parent. In
- that case, there's nothing to do. */
- if (parent->arch_private == NULL)
- return;
-
- /* Linux kernel before 2.6.33 commit
- 72f674d203cd230426437cdcf7dd6f681dad8b0d
- will inherit hardware debug registers from parent
- on fork/vfork/clone. Newer Linux kernels create such tasks with
- zeroed debug registers.
-
- GDB core assumes the child inherits the watchpoints/hw
- breakpoints of the parent, and will remove them all from the
- forked off process. Copy the debug registers mirrors into the
- new process so that all breakpoints and watchpoints can be
- removed together. The debug registers mirror will become zeroed
- in the end before detaching the forked off process, thus making
- this compatible with older Linux kernels too. */
-
- parent_pid = ptid_get_pid (parent->ptid);
- parent_state = i386_debug_reg_state (parent_pid);
- child_state = i386_debug_reg_state (child_pid);
- *child_state = *parent_state;
-}
-
-
-
/* Called by libthread_db. Returns a pointer to the thread local
storage (or its descriptor). */
ps_err_e
-ps_get_thread_area (const struct ps_prochandle *ph,
+ps_get_thread_area (const struct ps_prochandle *ph,
lwpid_t lwpid, int idx, void **base)
{
- /* NOTE: cagney/2003-08-26: The definition of this buffer is found
- in the kernel header . It, after padding, is 4 x
- 4 byte integers in size: `entry_number', `base_addr', `limit',
- and a bunch of status bits.
-
- The values returned by this ptrace call should be part of the
- regcache buffer, and ps_get_thread_area should channel its
- request through the regcache. That way remote targets could
- provide the value using the remote protocol and not this direct
- call.
-
- Is this function needed? I'm guessing that the `base' is the
- address of a descriptor that libthread_db uses to find the
- thread local address base that GDB needs. Perhaps that
- descriptor is defined by the ABI. Anyway, given that
- libthread_db calls this function without prompting (gdb
- requesting tls base) I guess it needs info in there anyway. */
- unsigned int desc[4];
- gdb_assert (sizeof (int) == 4);
-
-#ifndef PTRACE_GET_THREAD_AREA
-#define PTRACE_GET_THREAD_AREA 25
-#endif
+ unsigned int base_addr;
+ ps_err_e result;
+
+ result = x86_linux_get_thread_area (lwpid, (void *) idx, &base_addr);
- if (ptrace (PTRACE_GET_THREAD_AREA, lwpid,
- (void *) idx, (unsigned long) &desc) < 0)
- return PS_ERR;
+ if (result == PS_OK)
+ *(int *) base = base_addr;
- *(int *)base = desc[1];
- return PS_OK;
+ return result;
}
@@ -984,138 +712,7 @@ i386_linux_resume (struct target_ops *ops,
if (ptrace (request, pid, 0, gdb_signal_to_host (signal)) == -1)
perror_with_name (("ptrace"));
}
-
-static void (*super_post_startup_inferior) (struct target_ops *self,
- ptid_t ptid);
-
-static void
-i386_linux_child_post_startup_inferior (struct target_ops *self, ptid_t ptid)
-{
- i386_cleanup_dregs ();
- super_post_startup_inferior (self, ptid);
-}
-
-/* Get Linux/x86 target description from running target. */
-
-static const struct target_desc *
-i386_linux_read_description (struct target_ops *ops)
-{
- int tid;
- static uint64_t xcr0;
-
- /* GNU/Linux LWP ID's are process ID's. */
- tid = ptid_get_lwp (inferior_ptid);
- if (tid == 0)
- tid = ptid_get_pid (inferior_ptid); /* Not a threaded program. */
-
-#ifdef HAVE_PTRACE_GETFPXREGS
- if (have_ptrace_getfpxregs == -1)
- {
- elf_fpxregset_t fpxregs;
-
- if (ptrace (PTRACE_GETFPXREGS, tid, 0, (int) &fpxregs) < 0)
- {
- have_ptrace_getfpxregs = 0;
- have_ptrace_getregset = 0;
- return tdesc_i386_mmx_linux;
- }
- }
-#endif
-
- 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,
- &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 (long long))];
- }
- }
-
- /* Check the native XCR0 only if PTRACE_GETREGSET is available. */
- if (have_ptrace_getregset)
- {
- switch ((xcr0 & I386_XSTATE_ALL_MASK))
- {
- case I386_XSTATE_MPX_AVX512_MASK:
- case I386_XSTATE_AVX512_MASK:
- return tdesc_i386_avx512_linux;
- case I386_XSTATE_MPX_MASK:
- return tdesc_i386_mpx_linux;
- case I386_XSTATE_AVX_MASK:
- return tdesc_i386_avx_linux;
- default:
- return tdesc_i386_linux;
- }
- }
- else
- return tdesc_i386_linux;
-}
-
-/* Enable branch tracing. */
-
-static struct btrace_target_info *
-i386_linux_enable_btrace (struct target_ops *self, ptid_t ptid)
-{
- struct btrace_target_info *tinfo;
- struct gdbarch *gdbarch;
-
- errno = 0;
- tinfo = linux_enable_btrace (ptid);
-
- if (tinfo == NULL)
- error (_("Could not enable branch tracing for %s: %s."),
- target_pid_to_str (ptid), safe_strerror (errno));
-
- /* Fill in the size of a pointer in bits. */
- gdbarch = target_thread_architecture (ptid);
- tinfo->ptr_bits = gdbarch_ptr_bit (gdbarch);
-
- return tinfo;
-}
-
-/* Disable branch tracing. */
-
-static void
-i386_linux_disable_btrace (struct target_ops *self,
- struct btrace_target_info *tinfo)
-{
- enum btrace_error errcode = linux_disable_btrace (tinfo);
-
- if (errcode != BTRACE_ERR_NONE)
- error (_("Could not disable branch tracing."));
-}
-
-/* Teardown branch tracing. */
-
-static void
-i386_linux_teardown_btrace (struct target_ops *self,
- struct btrace_target_info *tinfo)
-{
- /* Ignore errors. */
- linux_disable_btrace (tinfo);
-}
-
-static enum btrace_error
-i386_linux_read_btrace (struct target_ops *self,
- VEC (btrace_block_s) **data,
- struct btrace_target_info *btinfo,
- enum btrace_read_type type)
-{
- return linux_read_btrace (data, btinfo, type);
-}
+
/* -Wmissing-prototypes */
extern initialize_file_ftype _initialize_i386_linux_nat;
@@ -1123,44 +720,16 @@ extern initialize_file_ftype _initialize_i386_linux_nat;
void
_initialize_i386_linux_nat (void)
{
- struct target_ops *t;
-
- /* Fill in the generic GNU/Linux methods. */
- t = linux_target ();
-
- i386_use_watchpoints (t);
-
- i386_dr_low.set_control = i386_linux_dr_set_control;
- i386_dr_low.set_addr = i386_linux_dr_set_addr;
- i386_dr_low.get_addr = i386_linux_dr_get_addr;
- i386_dr_low.get_status = i386_linux_dr_get_status;
- i386_dr_low.get_control = i386_linux_dr_get_control;
- i386_set_debug_register_length (4);
+ /* Create a generic x86 GNU/Linux target. */
+ struct target_ops *t = x86_linux_create_target ();
/* Override the default ptrace resume method. */
t->to_resume = i386_linux_resume;
- /* Override the GNU/Linux inferior startup hook. */
- super_post_startup_inferior = t->to_post_startup_inferior;
- t->to_post_startup_inferior = i386_linux_child_post_startup_inferior;
-
/* Add our register access methods. */
t->to_fetch_registers = i386_linux_fetch_inferior_registers;
t->to_store_registers = i386_linux_store_inferior_registers;
- t->to_read_description = i386_linux_read_description;
-
- /* Add btrace methods. */
- t->to_supports_btrace = linux_supports_btrace;
- t->to_enable_btrace = i386_linux_enable_btrace;
- t->to_disable_btrace = i386_linux_disable_btrace;
- t->to_teardown_btrace = i386_linux_teardown_btrace;
- t->to_read_btrace = i386_linux_read_btrace;
-
- /* Register the target. */
- linux_nat_add_target (t);
- linux_nat_set_new_thread (t, i386_linux_new_thread);
- linux_nat_set_new_fork (t, i386_linux_new_fork);
- linux_nat_set_forget_process (t, i386_forget_process);
- linux_nat_set_prepare_to_resume (t, i386_linux_prepare_to_resume);
+ /* Add the target. */
+ x86_linux_add_target (t);
}