/* Darwin support for GDB, the GNU debugger.
- Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2008
+ Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2008, 2009, 2010, 2011
Free Software Foundation, Inc.
Contributed by Apple Computer, Inc.
#include "regcache.h"
#include "gdb_assert.h"
#include "i386-tdep.h"
-#include "amd64-nat.h"
#include "i387-tdep.h"
#include "gdbarch.h"
#include "arch-utils.h"
+#include "gdbcore.h"
#include "darwin-nat.h"
#include "i386-darwin-tdep.h"
+#ifdef BFD64
+#include "amd64-nat.h"
+#include "amd64-tdep.h"
+#include "amd64-darwin-tdep.h"
+#endif
+
/* Read register values from the inferior process.
If REGNO is -1, do this for all registers.
Otherwise, REGNO specifies which register (so we can save time). */
static void
-i386_darwin_fetch_inferior_registers (struct regcache *regcache, int regno)
+i386_darwin_fetch_inferior_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
thread_t current_thread = ptid_get_tid (inferior_ptid);
int fetched = 0;
struct gdbarch *gdbarch = get_regcache_arch (regcache);
+#ifdef BFD64
if (gdbarch_ptr_bit (gdbarch) == 64)
{
if (regno == -1 || amd64_native_gregset_supplies_p (gdbarch, regno))
&gp_count);
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error calling thread_get_state for GP registers for thread 0x%ulx"), current_thread);
+ printf_unfiltered (_("Error calling thread_get_state for "
+ "GP registers for thread 0x%ulx"),
+ current_thread);
MACH_CHECK_ERROR (ret);
}
amd64_supply_native_gregset (regcache, &gp_regs.uts, -1);
&fp_count);
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error calling thread_get_state for float registers for thread 0x%ulx"), current_thread);
+ printf_unfiltered (_("Error calling thread_get_state for "
+ "float registers for thread 0x%ulx"),
+ current_thread);
MACH_CHECK_ERROR (ret);
}
- i387_supply_fxsave (regcache, -1, &fp_regs.ufs.fs64);
+ amd64_supply_fxsave (regcache, -1, &fp_regs.ufs.fs64.__fpu_fcw);
fetched++;
}
}
else
+#endif
{
if (regno == -1 || regno < I386_NUM_GREGS)
{
&gp_count);
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error calling thread_get_state for GP registers for thread 0x%ulx"), current_thread);
+ printf_unfiltered (_("Error calling thread_get_state for "
+ "GP registers for thread 0x%ulx"),
+ current_thread);
MACH_CHECK_ERROR (ret);
}
for (i = 0; i < I386_NUM_GREGS; i++)
&fp_count);
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error calling thread_get_state for float registers for thread 0x%ulx"), current_thread);
+ printf_unfiltered (_("Error calling thread_get_state for "
+ "float registers for thread 0x%ulx"),
+ current_thread);
MACH_CHECK_ERROR (ret);
}
i387_supply_fxsave (regcache, -1, &fp_regs.__fpu_fcw);
Otherwise, REGNO specifies which register (so we can save time). */
static void
-i386_darwin_store_inferior_registers (struct regcache *regcache, int regno)
+i386_darwin_store_inferior_registers (struct target_ops *ops,
+ struct regcache *regcache, int regno)
{
thread_t current_thread = ptid_get_tid (inferior_ptid);
struct gdbarch *gdbarch = get_regcache_arch (regcache);
+#ifdef BFD64
if (gdbarch_ptr_bit (gdbarch) == 64)
{
if (regno == -1 || amd64_native_gregset_supplies_p (gdbarch, regno))
gdb_assert (fp_regs.fsh.flavor == x86_FLOAT_STATE64);
gdb_assert (fp_regs.fsh.count == x86_FLOAT_STATE64_COUNT);
- i387_collect_fxsave (regcache, regno, &fp_regs.ufs.fs64.__fpu_fcw);
+ amd64_collect_fxsave (regcache, regno, &fp_regs.ufs.fs64.__fpu_fcw);
ret = thread_set_state (current_thread, x86_FLOAT_STATE,
(thread_state_t) & fp_regs,
}
}
else
+#endif
{
if (regno == -1 || regno < I386_NUM_GREGS)
{
/* Support for debug registers, boosted mostly from i386-linux-nat.c. */
-#ifndef DR_FIRSTADDR
-#define DR_FIRSTADDR 0
-#endif
-
-#ifndef DR_LASTADDR
-#define DR_LASTADDR 3
-#endif
-
-#ifndef DR_STATUS
-#define DR_STATUS 6
-#endif
-
-#ifndef DR_CONTROL
-#define DR_CONTROL 7
-#endif
-
-
static void
i386_darwin_dr_set (int regnum, uint32_t value)
{
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error reading debug registers thread 0x%x via thread_get_state\n"), (int) current_thread);
+ printf_unfiltered (_("Error reading debug registers "
+ "thread 0x%x via thread_get_state\n"),
+ (int) current_thread);
MACH_CHECK_ERROR (ret);
}
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error writing debug registers thread 0x%x via thread_get_state\n"), (int) current_thread);
+ printf_unfiltered (_("Error writing debug registers "
+ "thread 0x%x via thread_get_state\n"),
+ (int) current_thread);
MACH_CHECK_ERROR (ret);
}
}
if (ret != KERN_SUCCESS)
{
- printf_unfiltered (_("Error reading debug registers thread 0x%x via thread_get_state\n"), (int) current_thread);
+ printf_unfiltered (_("Error reading debug registers "
+ "thread 0x%x via thread_get_state\n"),
+ (int) current_thread);
MACH_CHECK_ERROR (ret);
}
i386_darwin_dr_set (DR_FIRSTADDR + regnum, addr);
}
-void
-i386_darwin_dr_reset_addr (int regnum)
+CORE_ADDR
+i386_darwin_dr_get_addr (int regnum)
{
- gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR);
-
- i386_darwin_dr_set (DR_FIRSTADDR + regnum, 0L);
+ return i386_darwin_dr_get (regnum);
}
unsigned long
return i386_darwin_dr_get (DR_STATUS);
}
+unsigned long
+i386_darwin_dr_get_control (void)
+{
+ return i386_darwin_dr_get (DR_CONTROL);
+}
+
void
darwin_check_osabi (darwin_inferior *inf, thread_t thread)
{
- if (gdbarch_osabi (current_gdbarch) == GDB_OSABI_UNKNOWN)
+ if (gdbarch_osabi (target_gdbarch) == GDB_OSABI_UNKNOWN)
{
/* Attaching to a process. Let's figure out what kind it is. */
x86_thread_state_t gp_regs;
gdbarch_info_init (&info);
gdbarch_info_fill (&info);
- info.byte_order = gdbarch_byte_order (current_gdbarch);
+ info.byte_order = gdbarch_byte_order (target_gdbarch);
info.osabi = GDB_OSABI_DARWIN;
if (gp_regs.tsh.flavor == x86_THREAD_STATE64)
info.bfd_arch_info = bfd_lookup_arch (bfd_arch_i386,
#define X86_EFLAGS_T 0x100UL
+/* Returning from a signal trampoline is done by calling a
+ special system call (sigreturn). This system call
+ restores the registers that were saved when the signal was
+ raised, including %eflags/%rflags. That means that single-stepping
+ won't work. Instead, we'll have to modify the signal context
+ that's about to be restored, and set the trace flag there. */
+
+static int
+i386_darwin_sstep_at_sigreturn (x86_thread_state_t *regs)
+{
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+ static const gdb_byte darwin_syscall[] = { 0xcd, 0x80 }; /* int 0x80 */
+ gdb_byte buf[sizeof (darwin_syscall)];
+
+ /* Check if PC is at a sigreturn system call. */
+ if (target_read_memory (regs->uts.ts32.__eip, buf, sizeof (buf)) == 0
+ && memcmp (buf, darwin_syscall, sizeof (darwin_syscall)) == 0
+ && regs->uts.ts32.__eax == 0xb8 /* SYS_sigreturn */)
+ {
+ ULONGEST uctx_addr;
+ ULONGEST mctx_addr;
+ ULONGEST flags_addr;
+ unsigned int eflags;
+
+ uctx_addr = read_memory_unsigned_integer
+ (regs->uts.ts32.__esp + 4, 4, byte_order);
+ mctx_addr = read_memory_unsigned_integer
+ (uctx_addr + 28, 4, byte_order);
+
+ flags_addr = mctx_addr + 12 + 9 * 4;
+ read_memory (flags_addr, (gdb_byte *) &eflags, 4);
+ eflags |= X86_EFLAGS_T;
+ write_memory (flags_addr, (gdb_byte *) &eflags, 4);
+
+ return 1;
+ }
+ return 0;
+}
+
+#ifdef BFD64
+static int
+amd64_darwin_sstep_at_sigreturn (x86_thread_state_t *regs)
+{
+ enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch);
+ static const gdb_byte darwin_syscall[] = { 0x0f, 0x05 }; /* syscall */
+ gdb_byte buf[sizeof (darwin_syscall)];
+
+ /* Check if PC is at a sigreturn system call. */
+ if (target_read_memory (regs->uts.ts64.__rip, buf, sizeof (buf)) == 0
+ && memcmp (buf, darwin_syscall, sizeof (darwin_syscall)) == 0
+ && (regs->uts.ts64.__rax & 0xffffffff) == 0x20000b8 /* SYS_sigreturn */)
+ {
+ ULONGEST mctx_addr;
+ ULONGEST flags_addr;
+ unsigned int rflags;
+
+ mctx_addr = read_memory_unsigned_integer
+ (regs->uts.ts64.__rdi + 48, 8, byte_order);
+ flags_addr = mctx_addr + 16 + 17 * 8;
+
+ /* AMD64 is little endian. */
+ read_memory (flags_addr, (gdb_byte *) &rflags, 4);
+ rflags |= X86_EFLAGS_T;
+ write_memory (flags_addr, (gdb_byte *) &rflags, 4);
+
+ return 1;
+ }
+ return 0;
+}
+#endif
+
void
darwin_set_sstep (thread_t thread, int enable)
{
kret, thread);
return;
}
+
switch (regs.tsh.flavor)
{
case x86_THREAD_STATE32:
{
__uint32_t bit = enable ? X86_EFLAGS_T : 0;
+ if (enable && i386_darwin_sstep_at_sigreturn (®s))
+ return;
if ((regs.uts.ts32.__eflags & X86_EFLAGS_T) == bit)
return;
- regs.uts.ts32.__eflags = (regs.uts.ts32.__eflags & ~X86_EFLAGS_T) | bit;
+ regs.uts.ts32.__eflags
+ = (regs.uts.ts32.__eflags & ~X86_EFLAGS_T) | bit;
kret = thread_set_state (thread, x86_THREAD_STATE,
(thread_state_t) ®s, count);
MACH_CHECK_ERROR (kret);
}
break;
+#ifdef BFD64
case x86_THREAD_STATE64:
{
__uint64_t bit = enable ? X86_EFLAGS_T : 0;
+ if (enable && amd64_darwin_sstep_at_sigreturn (®s))
+ return;
if ((regs.uts.ts64.__rflags & X86_EFLAGS_T) == bit)
return;
- regs.uts.ts64.__rflags = (regs.uts.ts64.__rflags & ~X86_EFLAGS_T) | bit;
+ regs.uts.ts64.__rflags
+ = (regs.uts.ts64.__rflags & ~X86_EFLAGS_T) | bit;
kret = thread_set_state (thread, x86_THREAD_STATE,
(thread_state_t) ®s, count);
MACH_CHECK_ERROR (kret);
}
break;
+#endif
default:
- error (_("darwin_set_sstep: unknown flavour: %d\n"), regs.tsh.flavor);
+ error (_("darwin_set_sstep: unknown flavour: %d"), regs.tsh.flavor);
}
}
void
darwin_complete_target (struct target_ops *target)
{
+#ifdef BFD64
amd64_native_gregset64_reg_offset = amd64_darwin_thread_state_reg_offset;
amd64_native_gregset64_num_regs = amd64_darwin_thread_state_num_regs;
amd64_native_gregset32_reg_offset = i386_darwin_thread_state_reg_offset;
amd64_native_gregset32_num_regs = i386_darwin_thread_state_num_regs;
+#endif
target->to_fetch_registers = i386_darwin_fetch_inferior_registers;
target->to_store_registers = i386_darwin_store_inferior_registers;
projects / deliverable / binutils-gdb.git / blobdiff