From a770d4eca642f4ae0d2e2e8d04a76933afed7b78 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 22 May 2004 22:34:44 +0000 Subject: [PATCH] * sparcnbsd-nat.c: Include "gdbcore.h", "regcache.h", , and "bsd-kvm.h". (sparc32nbsd_supply_pcb): New function. (_initialize_sparcnbsd_nat): Enable libkvm interface. * Makefile.in (sparcnbsd-nat.o): Update dependencies. * config/sparc/nbsdelf.mh (NATDEPFILES): Add bsd-kvm.o. (LOADLIBES): New variable. --- gdb/ChangeLog | 10 ++++++++++ gdb/Makefile.in | 3 ++- gdb/config/sparc/nbsdelf.mh | 4 +++- gdb/sparcnbsd-nat.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f95f5335fd2..30772fbabd2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2004-05-23 Mark Kettenis + + * sparcnbsd-nat.c: Include "gdbcore.h", "regcache.h", + , and "bsd-kvm.h". + (sparc32nbsd_supply_pcb): New function. + (_initialize_sparcnbsd_nat): Enable libkvm interface. + * Makefile.in (sparcnbsd-nat.o): Update dependencies. + * config/sparc/nbsdelf.mh (NATDEPFILES): Add bsd-kvm.o. + (LOADLIBES): New variable. + 2004-05-22 Mark Kettenis * bsd-kvm.c, bsd-kvm.h: New files. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f10df4e44e9..d2ef0bb9f2c 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2394,7 +2394,8 @@ sparc-linux-tdep.o: sparc-linux-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \ sparc-nat.o: sparc-nat.c $(defs_h) $(inferior_h) $(regcache_h) $(target_h) \ $(gdb_assert_h) $(gdb_string_h) $(gdb_wait_h) $(sparc_tdep_h) \ $(sparc_nat_h) -sparcnbsd-nat.o: sparcnbsd-nat.c $(defs_h) $(sparc_tdep_h) $(sparc_nat_h) +sparcnbsd-nat.o: sparcnbsd-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \ + $(sparc_tdep_h) $(sparc_nat_h) $(bsd_kvm_h) sparcnbsd-tdep.o: sparcnbsd-tdep.c $(defs_h) $(floatformat_h) $(frame_h) \ $(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) $(regset_h) \ $(solib_svr4_h) $(symtab_h) $(trad_frame_h) $(gdb_assert_h) \ diff --git a/gdb/config/sparc/nbsdelf.mh b/gdb/config/sparc/nbsdelf.mh index 45309ecaec0..611a6a4d2ad 100644 --- a/gdb/config/sparc/nbsdelf.mh +++ b/gdb/config/sparc/nbsdelf.mh @@ -1,4 +1,6 @@ # Host: NetBSD/sparc ELF -NATDEPFILES= sparc-nat.o sparcnbsd-nat.o \ +NATDEPFILES= sparc-nat.o sparcnbsd-nat.o bsd-kvm.o \ fork-child.o infptrace.o inftarg.o NAT_FILE= nm-nbsd.h + +LOADLIBES= -lkvm diff --git a/gdb/sparcnbsd-nat.c b/gdb/sparcnbsd-nat.c index 9038ea334b6..01089eeef32 100644 --- a/gdb/sparcnbsd-nat.c +++ b/gdb/sparcnbsd-nat.c @@ -20,10 +20,44 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" +#include "gdbcore.h" +#include "regcache.h" #include "sparc-tdep.h" #include "sparc-nat.h" +/* Support for debugging kernel virtual memory images. */ + +#include +#include + +#include "bsd-kvm.h" + +static int +sparc32nbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) +{ + /* The following is true for NetBSD 1.6.2: + + The pcb contains %sp, %sp, %psr and %wim. 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_sp == 0) + return 0; + + regcache_raw_supply (regcache, SPARC_SP_REGNUM, &pcb->pcb_sp); + regcache_raw_supply (regcache, SPARC_O7_REGNUM, &pcb->pcb_pc); + regcache_raw_supply (regcache, SPARC32_PSR_REGNUM, &pcb->pcb_psr); + regcache_raw_supply (regcache, SPARC32_WIM_REGNUM, &pcb->pcb_wim); + regcache_raw_supply (regcache, SPARC32_PC_REGNUM, &pcb->pcb_pc); + + sparc_supply_rwindow (regcache, pcb->pcb_sp, -1); + + return 1; +} + + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_sparcnbsd_nat (void); @@ -31,4 +65,7 @@ void _initialize_sparcnbsd_nat (void) { sparc_gregset = &sparc32nbsd_gregset; + + /* Support debugging kernel virtual memory images. */ + bsd_kvm_add_target (sparc32nbsd_supply_pcb); } -- 2.30.2