aboutsummaryrefslogtreecommitdiff
path: root/gdb/i386-darwin-nat.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/i386-darwin-nat.c')
-rw-r--r--gdb/i386-darwin-nat.c203
1 files changed, 142 insertions, 61 deletions
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index d7bd345..66ea943 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -260,7 +260,6 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
}
}
-#ifdef HW_WATCHPOINT_NOT_YET_ENABLED
/* Support for debug registers, boosted mostly from i386-linux-nat.c. */
static void
@@ -270,16 +269,16 @@ i386_darwin_dr_set (int regnum, uint32_t value)
thread_t current_thread;
x86_debug_state_t dr_regs;
kern_return_t ret;
- unsigned int dr_count = x86_DEBUG_STATE_COUNT;
+ unsigned int dr_count;
gdb_assert (regnum >= 0 && regnum <= DR_CONTROL);
current_thread = ptid_get_tid (inferior_ptid);
- dr_regs.dsh.flavor = x86_DEBUG_STATE32;
- dr_regs.dsh.count = x86_DEBUG_STATE32_COUNT;
+ dr_regs.dsh.flavor = x86_DEBUG_STATE;
+ dr_regs.dsh.count = x86_DEBUG_STATE_COUNT;
dr_count = x86_DEBUG_STATE_COUNT;
- ret = thread_get_state (current_thread, x86_DEBUG_STATE,
+ ret = thread_get_state (current_thread, x86_DEBUG_STATE,
(thread_state_t) &dr_regs, &dr_count);
if (ret != KERN_SUCCESS)
@@ -290,35 +289,71 @@ i386_darwin_dr_set (int regnum, uint32_t value)
MACH_CHECK_ERROR (ret);
}
- switch (regnum)
+ switch (dr_regs.dsh.flavor)
{
- case 0:
- dr_regs.uds.ds32.__dr0 = value;
- break;
- case 1:
- dr_regs.uds.ds32.__dr1 = value;
- break;
- case 2:
- dr_regs.uds.ds32.__dr2 = value;
- break;
- case 3:
- dr_regs.uds.ds32.__dr3 = value;
- break;
- case 4:
- dr_regs.uds.ds32.__dr4 = value;
- break;
- case 5:
- dr_regs.uds.ds32.__dr5 = value;
- break;
- case 6:
- dr_regs.uds.ds32.__dr6 = value;
- break;
- case 7:
- dr_regs.uds.ds32.__dr7 = value;
- break;
+ case x86_DEBUG_STATE32:
+ switch (regnum)
+ {
+ case 0:
+ dr_regs.uds.ds32.__dr0 = value;
+ break;
+ case 1:
+ dr_regs.uds.ds32.__dr1 = value;
+ break;
+ case 2:
+ dr_regs.uds.ds32.__dr2 = value;
+ break;
+ case 3:
+ dr_regs.uds.ds32.__dr3 = value;
+ break;
+ case 4:
+ dr_regs.uds.ds32.__dr4 = value;
+ break;
+ case 5:
+ dr_regs.uds.ds32.__dr5 = value;
+ break;
+ case 6:
+ dr_regs.uds.ds32.__dr6 = value;
+ break;
+ case 7:
+ dr_regs.uds.ds32.__dr7 = value;
+ break;
+ }
+ break;
+#ifdef BFD64
+ case x86_DEBUG_STATE64:
+ switch (regnum)
+ {
+ case 0:
+ dr_regs.uds.ds64.__dr0 = value;
+ break;
+ case 1:
+ dr_regs.uds.ds64.__dr1 = value;
+ break;
+ case 2:
+ dr_regs.uds.ds64.__dr2 = value;
+ break;
+ case 3:
+ dr_regs.uds.ds64.__dr3 = value;
+ break;
+ case 4:
+ dr_regs.uds.ds64.__dr4 = value;
+ break;
+ case 5:
+ dr_regs.uds.ds64.__dr5 = value;
+ break;
+ case 6:
+ dr_regs.uds.ds64.__dr6 = value;
+ break;
+ case 7:
+ dr_regs.uds.ds64.__dr7 = value;
+ break;
+ }
+ break;
+#endif
}
- ret = thread_set_state (current_thread, x86_DEBUG_STATE,
+ ret = thread_set_state (current_thread, x86_DEBUG_STATE,
(thread_state_t) &dr_regs, dr_count);
if (ret != KERN_SUCCESS)
@@ -336,16 +371,16 @@ i386_darwin_dr_get (int regnum)
thread_t current_thread;
x86_debug_state_t dr_regs;
kern_return_t ret;
- unsigned int dr_count = x86_DEBUG_STATE_COUNT;
+ unsigned int dr_count;
gdb_assert (regnum >= 0 && regnum <= DR_CONTROL);
current_thread = ptid_get_tid (inferior_ptid);
- dr_regs.dsh.flavor = x86_DEBUG_STATE32;
- dr_regs.dsh.count = x86_DEBUG_STATE32_COUNT;
+ dr_regs.dsh.flavor = x86_DEBUG_STATE;
+ dr_regs.dsh.count = x86_DEBUG_STATE_COUNT;
dr_count = x86_DEBUG_STATE_COUNT;
- ret = thread_get_state (current_thread, x86_DEBUG_STATE,
+ ret = thread_get_state (current_thread, x86_DEBUG_STATE,
(thread_state_t) &dr_regs, &dr_count);
if (ret != KERN_SUCCESS)
@@ -356,36 +391,68 @@ i386_darwin_dr_get (int regnum)
MACH_CHECK_ERROR (ret);
}
- switch (regnum)
+ switch (dr_regs.dsh.flavor)
{
- case 0:
- return dr_regs.uds.ds32.__dr0;
- case 1:
- return dr_regs.uds.ds32.__dr1;
- case 2:
- return dr_regs.uds.ds32.__dr2;
- case 3:
- return dr_regs.uds.ds32.__dr3;
- case 4:
- return dr_regs.uds.ds32.__dr4;
- case 5:
- return dr_regs.uds.ds32.__dr5;
- case 6:
- return dr_regs.uds.ds32.__dr6;
- case 7:
- return dr_regs.uds.ds32.__dr7;
- default:
- return -1;
+ case x86_DEBUG_STATE32:
+ switch (regnum)
+ {
+ case 0:
+ return dr_regs.uds.ds32.__dr0;
+ case 1:
+ return dr_regs.uds.ds32.__dr1;
+ case 2:
+ return dr_regs.uds.ds32.__dr2;
+ case 3:
+ return dr_regs.uds.ds32.__dr3;
+ case 4:
+ return dr_regs.uds.ds32.__dr4;
+ case 5:
+ return dr_regs.uds.ds32.__dr5;
+ case 6:
+ return dr_regs.uds.ds32.__dr6;
+ case 7:
+ return dr_regs.uds.ds32.__dr7;
+ default:
+ return -1;
+ }
+ break;
+#ifdef BFD64
+ case x86_DEBUG_STATE64:
+ switch (regnum)
+ {
+ case 0:
+ return dr_regs.uds.ds64.__dr0;
+ case 1:
+ return dr_regs.uds.ds64.__dr1;
+ case 2:
+ return dr_regs.uds.ds64.__dr2;
+ case 3:
+ return dr_regs.uds.ds64.__dr3;
+ case 4:
+ return dr_regs.uds.ds64.__dr4;
+ case 5:
+ return dr_regs.uds.ds64.__dr5;
+ case 6:
+ return dr_regs.uds.ds64.__dr6;
+ case 7:
+ return dr_regs.uds.ds64.__dr7;
+ default:
+ return -1;
+ }
+ break;
+#endif
+ default:
+ return -1;
}
}
-void
+static void
i386_darwin_dr_set_control (unsigned long control)
{
i386_darwin_dr_set (DR_CONTROL, control);
}
-void
+static void
i386_darwin_dr_set_addr (int regnum, CORE_ADDR addr)
{
gdb_assert (regnum >= 0 && regnum <= DR_LASTADDR - DR_FIRSTADDR);
@@ -393,24 +460,23 @@ i386_darwin_dr_set_addr (int regnum, CORE_ADDR addr)
i386_darwin_dr_set (DR_FIRSTADDR + regnum, addr);
}
-CORE_ADDR
+static CORE_ADDR
i386_darwin_dr_get_addr (int regnum)
{
return i386_darwin_dr_get (regnum);
}
-unsigned long
+static unsigned long
i386_darwin_dr_get_status (void)
{
return i386_darwin_dr_get (DR_STATUS);
}
-unsigned long
+static unsigned long
i386_darwin_dr_get_control (void)
{
return i386_darwin_dr_get (DR_CONTROL);
}
-#endif
void
darwin_check_osabi (darwin_inferior *inf, thread_t thread)
@@ -439,7 +505,7 @@ darwin_check_osabi (darwin_inferior *inf, thread_t thread)
info.bfd_arch_info = bfd_lookup_arch (bfd_arch_i386,
bfd_mach_x86_64);
else
- info.bfd_arch_info = bfd_lookup_arch (bfd_arch_i386,
+ info.bfd_arch_info = bfd_lookup_arch (bfd_arch_i386,
bfd_mach_i386_i386);
gdbarch_update_p (info);
}
@@ -583,6 +649,21 @@ darwin_complete_target (struct target_ops *target)
amd64_native_gregset32_num_regs = i386_darwin_thread_state_num_regs;
#endif
+ i386_use_watchpoints (target);
+
+ i386_dr_low.set_control = i386_darwin_dr_set_control;
+ i386_dr_low.set_addr = i386_darwin_dr_set_addr;
+ i386_dr_low.get_addr = i386_darwin_dr_get_addr;
+ i386_dr_low.get_status = i386_darwin_dr_get_status;
+ i386_dr_low.get_control = i386_darwin_dr_get_control;
+
+ /* Let's assume that the kernel is 64 bits iff the executable is. */
+#ifdef __x86_64__
+ i386_set_debug_register_length (8);
+#else
+ i386_set_debug_register_length (4);
+#endif
+
target->to_fetch_registers = i386_darwin_fetch_inferior_registers;
target->to_store_registers = i386_darwin_store_inferior_registers;
}
generated by cgit v1.1 at 2024-11-24 05:16:30 +0000