/* GNU/Linux/x86-64 specific low level interface, for the remote server
for GDB.
- Copyright (C) 2002-2014 Free Software Foundation, Inc.
+ Copyright (C) 2002-2015 Free Software Foundation, Inc.
This file is part of GDB.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include <stddef.h>
+#include "server.h"
#include <signal.h>
#include <limits.h>
#include <inttypes.h>
-#include "server.h"
#include "linux-low.h"
#include "i387-fp.h"
-#include "i386-low.h"
-#include "i386-xstate.h"
+#include "x86-low.h"
+#include "x86-xstate.h"
#include "gdb_proc_service.h"
/* Don't include elf/common.h if linux/elf.h got included by
#include "tdesc.h"
#include "tracepoint.h"
#include "ax.h"
+#include "nat/linux-nat.h"
+#include "nat/x86-linux.h"
+#include "nat/x86-linux-dregs.h"
#ifdef __x86_64__
/* Defined in auto-generated file amd64-linux.c. */
struct arch_process_info
{
- struct i386_debug_reg_state debug_reg_state;
-};
-
-/* 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;
+ struct x86_debug_reg_state debug_reg_state;
};
#ifdef __x86_64__
/* So code below doesn't have to care, i386 or amd64. */
#define ORIG_EAX ORIG_RAX
+#define REGSIZE 8
static const int x86_64_regmap[] =
{
#define I386_NUM_REGS (sizeof (i386_regmap) / sizeof (i386_regmap[0]))
+#define REGSIZE 4
+
#endif
#ifdef __x86_64__
static int
is_64bit_tdesc (void)
{
- struct regcache *regcache = get_thread_regcache (current_inferior, 0);
+ struct regcache *regcache = get_thread_regcache (current_thread, 0);
return register_size (regcache->tdesc, 0) == 8;
}
collect_register (regcache, i, ((char *) buf) + i386_regmap[i]);
collect_register_by_name (regcache, "orig_eax",
- ((char *) buf) + ORIG_EAX * 4);
+ ((char *) buf) + ORIG_EAX * REGSIZE);
}
static void
supply_register (regcache, i, ((char *) buf) + i386_regmap[i]);
supply_register_by_name (regcache, "orig_eax",
- ((char *) buf) + ORIG_EAX * 4);
+ ((char *) buf) + ORIG_EAX * REGSIZE);
}
static void
return 0;
}
\f
-/* Support for debug registers. */
-
-static unsigned long
-x86_linux_dr_get (ptid_t ptid, int regnum)
-{
- int tid;
- unsigned long value;
-
- tid = ptid_get_lwp (ptid);
-
- errno = 0;
- value = ptrace (PTRACE_PEEKUSER, tid,
- offsetof (struct user, u_debugreg[regnum]), 0);
- if (errno != 0)
- error ("Couldn't read debug register");
-
- return value;
-}
-
-static void
-x86_linux_dr_set (ptid_t ptid, int regnum, unsigned long value)
-{
- int tid;
-
- tid = ptid_get_lwp (ptid);
-
- errno = 0;
- ptrace (PTRACE_POKEUSER, tid,
- offsetof (struct user, u_debugreg[regnum]), value);
- if (errno != 0)
- error ("Couldn't write debug register");
-}
-
-static int
-update_debug_registers_callback (struct inferior_list_entry *entry,
- void *pid_p)
-{
- struct thread_info *thr = (struct thread_info *) entry;
- struct lwp_info *lwp = get_thread_lwp (thr);
- int pid = *(int *) pid_p;
-
- /* Only update the threads of this process. */
- if (pid_of (thr) == pid)
- {
- /* 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);
- }
-
- return 0;
-}
-
-/* Update the inferior's debug register REGNUM from STATE. */
-
-void
-i386_dr_low_set_addr (const struct i386_debug_reg_state *state, int regnum)
-{
- /* Only update the threads of this process. */
- int pid = pid_of (current_inferior);
-
- if (! (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR))
- fatal ("Invalid debug register %d", regnum);
-
- find_inferior (&all_threads, update_debug_registers_callback, &pid);
-}
-
-/* Return the inferior's debug register REGNUM. */
-
-CORE_ADDR
-i386_dr_low_get_addr (int regnum)
-{
- ptid_t ptid = ptid_of (current_inferior);
-
- /* DR6 and DR7 are retrieved with some other way. */
- gdb_assert (DR_FIRSTADDR <= regnum && regnum <= DR_LASTADDR);
-
- return x86_linux_dr_get (ptid, regnum);
-}
-
-/* Update the inferior's DR7 debug control register from STATE. */
-
-void
-i386_dr_low_set_control (const struct i386_debug_reg_state *state)
-{
- /* Only update the threads of this process. */
- int pid = pid_of (current_inferior);
-
- find_inferior (&all_threads, update_debug_registers_callback, &pid);
-}
-
-/* Return the inferior's DR7 debug control register. */
-
-unsigned
-i386_dr_low_get_control (void)
-{
- ptid_t ptid = ptid_of (current_inferior);
-
- return x86_linux_dr_get (ptid, DR_CONTROL);
-}
-
-/* Get the value of the DR6 debug status register from the inferior
- and record it in STATE. */
-
-unsigned
-i386_dr_low_get_status (void)
-{
- ptid_t ptid = ptid_of (current_inferior);
-
- return x86_linux_dr_get (ptid, DR_STATUS);
-}
+/* Low-level function vector. */
+struct x86_dr_low_type x86_dr_low =
+ {
+ x86_linux_dr_set_control,
+ x86_linux_dr_set_addr,
+ x86_linux_dr_get_addr,
+ x86_linux_dr_get_status,
+ x86_linux_dr_get_control,
+ sizeof (void *),
+ };
\f
/* Breakpoint/Watchpoint support. */
{
enum target_hw_bp_type hw_type
= raw_bkpt_type_to_target_hw_bp_type (type);
- struct i386_debug_reg_state *state
- = &proc->private->arch_private->debug_reg_state;
+ struct x86_debug_reg_state *state
+ = &proc->priv->arch_private->debug_reg_state;
- return i386_low_insert_watchpoint (state, hw_type, addr, size);
+ return x86_dr_insert_watchpoint (state, hw_type, addr, size);
}
default:
{
enum target_hw_bp_type hw_type
= raw_bkpt_type_to_target_hw_bp_type (type);
- struct i386_debug_reg_state *state
- = &proc->private->arch_private->debug_reg_state;
+ struct x86_debug_reg_state *state
+ = &proc->priv->arch_private->debug_reg_state;
- return i386_low_remove_watchpoint (state, hw_type, addr, size);
+ return x86_dr_remove_watchpoint (state, hw_type, addr, size);
}
default:
/* Unsupported. */
x86_stopped_by_watchpoint (void)
{
struct process_info *proc = current_process ();
- return i386_low_stopped_by_watchpoint (&proc->private->arch_private->debug_reg_state);
+ return x86_dr_stopped_by_watchpoint (&proc->priv->arch_private->debug_reg_state);
}
static CORE_ADDR
{
struct process_info *proc = current_process ();
CORE_ADDR addr;
- if (i386_low_stopped_data_address (&proc->private->arch_private->debug_reg_state,
- &addr))
+ if (x86_dr_stopped_data_address (&proc->priv->arch_private->debug_reg_state,
+ &addr))
return addr;
return 0;
}
static struct arch_process_info *
x86_linux_new_process (void)
{
- struct arch_process_info *info = xcalloc (1, sizeof (*info));
+ struct arch_process_info *info = XCNEW (struct arch_process_info);
- i386_low_init_dregs (&info->debug_reg_state);
+ x86_low_init_dregs (&info->debug_reg_state);
return info;
}
/* Called when a new thread is detected. */
-static struct arch_lwp_info *
-x86_linux_new_thread (void)
+static void
+x86_linux_new_thread (struct lwp_info *lwp)
{
- struct arch_lwp_info *info = xcalloc (1, sizeof (*info));
+ lwp_set_debug_registers_changed (lwp, 1);
+}
- info->debug_registers_changed = 1;
+/* See nat/x86-dregs.h. */
- return info;
+struct x86_debug_reg_state *
+x86_debug_reg_state (pid_t pid)
+{
+ struct process_info *proc = find_process_pid (pid);
+
+ return &proc->priv->arch_private->debug_reg_state;
}
-/* Called when resuming a thread.
- If the debug regs have changed, update the thread's copies. */
+/* Called prior to resuming a thread. */
static void
x86_linux_prepare_to_resume (struct lwp_info *lwp)
{
- ptid_t ptid = ptid_of (get_lwp_thread (lwp));
- int clear_status = 0;
-
- if (lwp->arch_private->debug_registers_changed)
- {
- int i;
- int pid = ptid_get_pid (ptid);
- struct process_info *proc = find_process_pid (pid);
- struct i386_debug_reg_state *state
- = &proc->private->arch_private->debug_reg_state;
-
- for (i = DR_FIRSTADDR; i <= DR_LASTADDR; i++)
- if (state->dr_ref_count[i] > 0)
- {
- x86_linux_dr_set (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_low_stopped_data_address can
- get confused. */
- clear_status = 1;
- }
-
- x86_linux_dr_set (ptid, DR_CONTROL, state->dr_control_mirror);
-
- lwp->arch_private->debug_registers_changed = 0;
- }
-
- if (clear_status || lwp->stopped_by_watchpoint)
- x86_linux_dr_set (ptid, DR_STATUS, 0);
+ x86_linux_update_debug_registers (lwp);
}
\f
/* When GDBSERVER is built as a 64-bit application on linux, the
{
#ifdef __x86_64__
unsigned int machine;
- int tid = lwpid_of (current_inferior);
+ int tid = lwpid_of (current_thread);
int is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
/* Is the inferior 32-bit? If so, then fixup the siginfo object. */
if (!is_64bit_tdesc ())
{
- if (sizeof (siginfo_t) != sizeof (compat_siginfo_t))
- fatal ("unexpected difference in siginfo");
+ gdb_assert (sizeof (siginfo_t) == sizeof (compat_siginfo_t));
if (direction == 0)
compat_siginfo_from_siginfo ((struct compat_siginfo *) inf, native);
/* No fixup for native x32 GDB. */
else if (!is_elf64 && sizeof (void *) == 8)
{
- if (sizeof (siginfo_t) != sizeof (compat_x32_siginfo_t))
- fatal ("unexpected difference in siginfo");
+ gdb_assert (sizeof (siginfo_t) == sizeof (compat_x32_siginfo_t));
if (direction == 0)
compat_x32_siginfo_from_siginfo ((struct compat_x32_siginfo *) inf,
static uint64_t xcr0;
struct regset_info *regset;
- tid = lwpid_of (current_inferior);
+ tid = lwpid_of (current_thread);
is_elf64 = linux_pid_exe_is_elf_64_file (tid, &machine);
if (!use_xml)
{
- x86_xcr0 = I386_XSTATE_SSE_MASK;
+ x86_xcr0 = X86_XSTATE_SSE_MASK;
/* Don't use XML. */
#ifdef __x86_64__
if (have_ptrace_getregset == -1)
{
- uint64_t xstateregs[(I386_XSTATE_SSE_SIZE / sizeof (uint64_t))];
+ uint64_t xstateregs[(X86_XSTATE_SSE_SIZE / sizeof (uint64_t))];
struct iovec iov;
iov.iov_base = xstateregs;
for (regset = x86_regsets;
regset->fill_function != NULL; regset++)
if (regset->get_request == PTRACE_GETREGSET)
- regset->size = I386_XSTATE_SIZE (xcr0);
+ regset->size = X86_XSTATE_SIZE (xcr0);
else if (regset->type != GENERAL_REGS)
regset->size = 0;
}
/* Check the native XCR0 only if PTRACE_GETREGSET is available. */
xcr0_features = (have_ptrace_getregset
- && (xcr0 & I386_XSTATE_ALL_MASK));
+ && (xcr0 & X86_XSTATE_ALL_MASK));
if (xcr0_features)
x86_xcr0 = xcr0;
{
if (xcr0_features)
{
- switch (xcr0 & I386_XSTATE_ALL_MASK)
+ switch (xcr0 & X86_XSTATE_ALL_MASK)
{
- case I386_XSTATE_AVX512_MASK:
+ case X86_XSTATE_AVX512_MASK:
return tdesc_amd64_avx512_linux;
- case I386_XSTATE_MPX_MASK:
+ case X86_XSTATE_MPX_MASK:
return tdesc_amd64_mpx_linux;
- case I386_XSTATE_AVX_MASK:
+ case X86_XSTATE_AVX_MASK:
return tdesc_amd64_avx_linux;
default:
{
if (xcr0_features)
{
- switch (xcr0 & I386_XSTATE_ALL_MASK)
+ switch (xcr0 & X86_XSTATE_ALL_MASK)
{
- case I386_XSTATE_AVX512_MASK:
+ case X86_XSTATE_AVX512_MASK:
return tdesc_x32_avx512_linux;
- case I386_XSTATE_MPX_MASK: /* No MPX on x32. */
- case I386_XSTATE_AVX_MASK:
+ case X86_XSTATE_MPX_MASK: /* No MPX on x32. */
+ case X86_XSTATE_AVX_MASK:
return tdesc_x32_avx_linux;
default:
{
if (xcr0_features)
{
- switch (xcr0 & I386_XSTATE_ALL_MASK)
+ switch (xcr0 & X86_XSTATE_ALL_MASK)
{
- case (I386_XSTATE_AVX512_MASK):
+ case (X86_XSTATE_AVX512_MASK):
return tdesc_i386_avx512_linux;
- case (I386_XSTATE_MPX_MASK):
+ case (X86_XSTATE_MPX_MASK):
return tdesc_i386_mpx_linux;
- case (I386_XSTATE_AVX_MASK):
+ case (X86_XSTATE_AVX_MASK):
return tdesc_i386_avx_linux;
default:
int pid = ptid_get_pid (entry->id);
/* Look up any thread of this processes. */
- current_inferior
+ current_thread
= (struct thread_info *) find_inferior (&all_threads,
same_process_callback, &pid);
static void
x86_linux_update_xmltarget (void)
{
- struct thread_info *save_inferior = current_inferior;
+ struct thread_info *saved_thread = current_thread;
/* Before changing the register cache's internal layout, flush the
contents of the current valid caches back to the threads, and
for_each_inferior (&all_processes, x86_arch_setup_process_callback);
- current_inferior = save_inferior;
+ current_thread = saved_thread;
}
/* Process qSupported query, "xmlRegisters=". Update the buffer size for
with "i386" in qSupported query, it supports x86 XML target
descriptions. */
use_xml = 0;
- if (query != NULL && strncmp (query, "xmlRegisters=", 13) == 0)
+ if (query != NULL && startswith (query, "xmlRegisters="))
{
char *copy = xstrdup (query + 13);
char *p;
projects / deliverable / binutils-gdb.git / blobdiff