#include "defs.h"
#include "inferior.h"
#include "regcache.h"
+#include "target.h"
#include <sys/types.h>
#include <sys/ptrace.h>
#include <sys/sysctl.h>
+#include "fbsd-nat.h"
#include "i386-tdep.h"
+#include "i386bsd-nat.h"
-/* Prevent warning from -Wmissing-prototypes. */
-void _initialize_i386fbsd_nat (void);
-
-/* Resume execution of the inferior process.
- If STEP is nonzero, single-step it.
- If SIGNAL is nonzero, give it that signal. */
+/* Resume execution of the inferior process. If STEP is nonzero,
+ single-step it. If SIGNAL is nonzero, give it that signal. */
-void
-child_resume (ptid_t ptid, int step, enum target_signal signal)
+static void
+i386fbsd_resume (ptid_t ptid, int step, enum target_signal signal)
{
pid_t pid = ptid_get_pid (ptid);
int request = PT_STEP;
written a new PC value to the child.) */
if (ptrace (request, pid, (caddr_t) 1,
target_signal_to_host (signal)) == -1)
- perror_with_name ("ptrace");
+ perror_with_name (("ptrace"));
}
\f
+
+/* Support for debugging kernel virtual memory images. */
+
+#include <sys/types.h>
+#include <machine/pcb.h>
+
+#include "bsd-kvm.h"
+
+static int
+i386fbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
+ /* The following is true for FreeBSD 4.7:
+
+ The pcb contains %eip, %ebx, %esp, %ebp, %esi, %edi and %gs.
+ This accounts for all callee-saved registers specified by the
+ psABI and then some. Here %esp contains the stack pointer at the
+ point just after the call to cpu_switch(). From this information
+ we reconstruct the register state as it would look when we just
+ returned from cpu_switch(). */
+
+ /* The stack pointer shouldn't be zero. */
+ if (pcb->pcb_esp == 0)
+ return 0;
+
+ pcb->pcb_esp += 4;
+ regcache_raw_supply (regcache, I386_EDI_REGNUM, &pcb->pcb_edi);
+ regcache_raw_supply (regcache, I386_ESI_REGNUM, &pcb->pcb_esi);
+ regcache_raw_supply (regcache, I386_EBP_REGNUM, &pcb->pcb_ebp);
+ regcache_raw_supply (regcache, I386_ESP_REGNUM, &pcb->pcb_esp);
+ regcache_raw_supply (regcache, I386_EBX_REGNUM, &pcb->pcb_ebx);
+ regcache_raw_supply (regcache, I386_EIP_REGNUM, &pcb->pcb_eip);
+ regcache_raw_supply (regcache, I386_GS_REGNUM, &pcb->pcb_gs);
+
+ return 1;
+}
+\f
+
+/* Prevent warning from -Wmissing-prototypes. */
+void _initialize_i386fbsd_nat (void);
+
void
_initialize_i386fbsd_nat (void)
{
+ struct target_ops *t;
+
+ /* Add some extra features to the common *BSD/i386 target. */
+ t = i386bsd_target ();
+ t->to_resume = i386fbsd_resume;
+ t->to_pid_to_exec_file = fbsd_pid_to_exec_file;
+ t->to_find_memory_regions = fbsd_find_memory_regions;
+ t->to_make_corefile_notes = fbsd_make_corefile_notes;
+ add_target (t);
+
+ /* Support debugging kernel virtual memory images. */
+ bsd_kvm_add_target (i386fbsd_supply_pcb);
+
/* FreeBSD provides a kern.ps_strings sysctl that we can use to
locate the sigtramp. That way we can still recognize a sigtramp
if its location is changed in a new kernel. Of course this is
#ifdef KERN_PS_STRINGS
{
int mib[2];
- int ps_strings;
+ u_long ps_strings;
size_t len;
mib[0] = CTL_KERN;