From 9062529b147a181e6d9bc99aafdd29a689e8e38c Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 27 Jun 2004 16:22:43 +0000 Subject: [PATCH] * i386nbsd-nat.c: New file. * Makefile.in (ALLDEPFILES): Add i386nbsd-nat.c, i386nbsd-tdep.c, i386obsd-nat.c and i386obsd-tdep.c. (i386nbsd-nat.o): New dependency. * config/i386/obsd.mh (NATDEPFILES): Add i386nbsd-nat.o and bsd-kvm.o. (LOADLIBES): New variable. * config/i386/nbsdelf.mh (NATDEPFILES): Add i386nbsd-nat.o and bsd-kvm.o. (LOADLIBES): New variable. --- gdb/ChangeLog | 11 +++++ gdb/Makefile.in | 3 ++ gdb/config/i386/nbsdelf.mh | 5 ++- gdb/config/i386/obsd.mh | 6 ++- gdb/i386nbsd-nat.c | 82 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 2 deletions(-) create mode 100644 gdb/i386nbsd-nat.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0515ac1dd02..0937dd51c8e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 2004-06-27 Mark Kettenis + * i386nbsd-nat.c: New file. + * Makefile.in (ALLDEPFILES): Add i386nbsd-nat.c, i386nbsd-tdep.c, + i386obsd-nat.c and i386obsd-tdep.c. + (i386nbsd-nat.o): New dependency. + * config/i386/obsd.mh (NATDEPFILES): Add i386nbsd-nat.o and + bsd-kvm.o. + (LOADLIBES): New variable. + * config/i386/nbsdelf.mh (NATDEPFILES): Add i386nbsd-nat.o and + bsd-kvm.o. + (LOADLIBES): New variable. + * config/i386/fbsd64.mh (NATDEPFILES): Add bsd-kvm.o. (LOADLIBES): New variable. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 01d98ee1a8d..db0a9190091 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1364,6 +1364,7 @@ ALLDEPFILES = \ i386-tdep.c i386v-nat.c i386-linux-nat.c \ i386v4-nat.c i386ly-tdep.c i386-cygwin-tdep.c \ i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \ + i386nbsd-nat.c i386nbsd-tdep.c i386obsd-nat.c i386obsd-tdep.c \ i387-tdep.c \ i386-linux-tdep.c i386-nat.c \ i386gnu-nat.c i386gnu-tdep.c \ @@ -1913,6 +1914,8 @@ i386-linux-tdep.o: i386-linux-tdep.c $(defs_h) $(gdbcore_h) $(frame_h) \ i386ly-tdep.o: i386ly-tdep.c $(defs_h) $(gdbcore_h) $(inferior_h) \ $(regcache_h) $(target_h) $(osabi_h) $(i386_tdep_h) i386-nat.o: i386-nat.c $(defs_h) $(breakpoint_h) $(command_h) $(gdbcmd_h) +i386nbsd-nat.o: i386nbsd-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \ + $(i386_tdep_h) $(bsd_kvm_h) i386nbsd-tdep.o: i386nbsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ $(gdbcore_h) $(regcache_h) $(regset_h) $(osabi_h) $(symtab_h) \ $(gdb_assert_h) $(gdb_string_h) $(i386_tdep_h) $(i387_tdep_h) \ diff --git a/gdb/config/i386/nbsdelf.mh b/gdb/config/i386/nbsdelf.mh index 0d313ddac82..b888569f01e 100644 --- a/gdb/config/i386/nbsdelf.mh +++ b/gdb/config/i386/nbsdelf.mh @@ -1,4 +1,7 @@ # Host: NetBSD/i386 ELF -NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o \ + i386bsd-nat.o i386nbsd-nat.o bsd-kvm.o NAT_FILE= nm-nbsd.h XM_FILE= xm-nbsd.h + +LOADLIBES= -lkvm diff --git a/gdb/config/i386/obsd.mh b/gdb/config/i386/obsd.mh index 50a4fb71062..c1f3c502abe 100644 --- a/gdb/config/i386/obsd.mh +++ b/gdb/config/i386/obsd.mh @@ -1,4 +1,8 @@ # Host: OpenBSD/i386 ELF -NATDEPFILES= fork-child.o infptrace.o inftarg.o i386bsd-nat.o i386obsd-nat.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o \ + i386bsd-nat.o i386obsd-nat.o i386nbsd-nat.o bsd-kvm.o NAT_FILE= nm-obsd.h XM_FILE= xm-i386.h + +LOADLIBES= -lkvm + diff --git a/gdb/i386nbsd-nat.c b/gdb/i386nbsd-nat.c new file mode 100644 index 00000000000..92da7e18dcd --- /dev/null +++ b/gdb/i386nbsd-nat.c @@ -0,0 +1,82 @@ +/* Native-dependent code for NetBSD/i386. + + Copyright 2004 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "defs.h" +#include "gdbcore.h" +#include "regcache.h" + +#include "i386-tdep.h" + +/* Support for debugging kernel virtual memory images. */ + +#include +#include +#include + +#include "bsd-kvm.h" + +static int +i386nbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) +{ + struct switchframe sf; + + /* The following is true for NetBSD 1.6.2: + + The pcb contains %esp and %ebp at the point of the context switch + in cpu_switch(). At that point we have a stack frame as + described by `struct switchframe', which for NetBSD 1.6.2 has the + following layout: + + interrupt level + %edi + %esi + %ebx + %eip + + 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; + + read_memory (pcb->pcb_esp, (char *) &sf, sizeof sf); + pcb->pcb_esp += sizeof (struct switchframe); + regcache_raw_supply (regcache, I386_EDI_REGNUM, &sf.sf_edi); + regcache_raw_supply (regcache, I386_ESI_REGNUM, &sf.sf_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, &sf.sf_ebx); + regcache_raw_supply (regcache, I386_EIP_REGNUM, &sf.sf_eip); + + return 1; +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_i386nbsd_nat (void); + +void +_initialize_i386nbsd_nat (void) +{ + /* Support debugging kernel virtual memory images. */ + bsd_kvm_add_target (i386nbsd_supply_pcb); +} -- 2.30.2