From 37191c9c2e0908b431866448db97b6501818af5f Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 15 Jul 2005 20:10:19 +0000 Subject: [PATCH] Marcel Moolenaar * sparc64fbsd-nat.c: Include "regcache.h", , and "bsd-kvm.h". (sparc64fbsd_kvm_supply_pcb): New function. (_initialize_sparc64fbsd_nat): Enable libkvm interface. * config/sparc/fbsd.mh (NATDEPFILES): Add bsd-kvm.o. (LOADLIBES): New variable. * Makefile.in (sparc64fbsd-nat.o): Update dependencies. --- gdb/ChangeLog | 11 +++++++++++ gdb/Makefile.in | 4 ++-- gdb/config/sparc/fbsd.mh | 4 +++- gdb/sparc64fbsd-nat.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 005380b924b..6dddba23b36 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2005-07-15 Mark Kettenis + Marcel Moolenaar + + * sparc64fbsd-nat.c: Include "regcache.h", , + and "bsd-kvm.h". + (sparc64fbsd_kvm_supply_pcb): New function. + (_initialize_sparc64fbsd_nat): Enable libkvm interface. + * config/sparc/fbsd.mh (NATDEPFILES): Add bsd-kvm.o. + (LOADLIBES): New variable. + * Makefile.in (sparc64fbsd-nat.o): Update dependencies. + 2005-07-15 Nick Roberts Daniel Jacobowitz diff --git a/gdb/Makefile.in b/gdb/Makefile.in index fad41f2fa36..112e2f505f5 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -2563,8 +2563,8 @@ source.o: source.c $(defs_h) $(symtab_h) $(expression_h) $(language_h) \ $(gdb_string_h) $(gdb_stat_h) $(gdbcore_h) $(gdb_regex_h) \ $(symfile_h) $(objfiles_h) $(annotate_h) $(gdbtypes_h) $(linespec_h) \ $(filenames_h) $(completer_h) $(ui_out_h) $(readline_h) -sparc64fbsd-nat.o: sparc64fbsd-nat.c $(defs_h) $(target_h) $(fbsd_nat_h) \ - $(sparc64_tdep_h) $(sparc_nat_h) +sparc64fbsd-nat.o: sparc64fbsd-nat.c $(defs_h) $(regcache_h) $(target_h) \ + $(fbsd_nat_h) $(sparc64_tdep_h) $(sparc_nat_h) $(bsd_kvm_h) sparc64fbsd-tdep.o: sparc64fbsd-tdep.c $(defs_h) $(frame_h) \ $(frame_unwind_h) $(gdbcore_h) $(osabi_h) $(regcache_h) $(regset_h) \ $(target_h) $(trad_frame_h) $(gdb_assert_h) $(gdb_string_h) \ diff --git a/gdb/config/sparc/fbsd.mh b/gdb/config/sparc/fbsd.mh index acacaf429d5..06cfd1afa99 100644 --- a/gdb/config/sparc/fbsd.mh +++ b/gdb/config/sparc/fbsd.mh @@ -1,4 +1,6 @@ # Host: FreeBSD/sparc64 NATDEPFILES= fork-child.o inf-ptrace.o \ fbsd-nat.o sparc-nat.o sparc64-nat.o sparc64fbsd-nat.o \ - gcore.o + gcore.o bsd-kvm.o + +LOADLIBES= -lkvm diff --git a/gdb/sparc64fbsd-nat.c b/gdb/sparc64fbsd-nat.c index dab419ae3be..47e6ef674b6 100644 --- a/gdb/sparc64fbsd-nat.c +++ b/gdb/sparc64fbsd-nat.c @@ -20,11 +20,47 @@ Boston, MA 02111-1307, USA. */ #include "defs.h" +#include "regcache.h" #include "target.h" #include "fbsd-nat.h" #include "sparc64-tdep.h" #include "sparc-nat.h" + + +/* Support for debugging kernel virtual memory images. */ + +#include +#include + +#include "bsd-kvm.h" + +static int +sparc64fbsd_kvm_supply_pcb (struct regcache *regcache, struct pcb *pcb) +{ + /* The following is true for FreeBSD 5.4: + + The pcb contains %sp and %pc. Since the register windows are + explicitly flushed, we can find the `local' and `in' registers on + the stack. */ + + /* 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, SPARC64_PC_REGNUM, &pcb->pcb_pc); + + /* Synthesize %npc. */ + pcb->pcb_pc += 4; + regcache_raw_supply (regcache, SPARC64_NPC_REGNUM, &pcb->pcb_pc); + + /* Read `local' and `in' registers from the stack. */ + sparc_supply_rwindow (regcache, pcb->pcb_sp, -1); + + return 1; +} + /* Provide a prototype to silence -Wmissing-prototypes. */ void _initialize_sparc64fbsd_nat (void); @@ -42,4 +78,7 @@ _initialize_sparc64fbsd_nat (void) add_target (t); sparc_gregset = &sparc64fbsd_gregset; + + /* Support debugging kernel virtual memory images. */ + bsd_kvm_add_target (sparc64fbsd_kvm_supply_pcb); } -- 2.30.2