[PATCH] libkvm interface for OpenBSD/vax and NetBSD/vax

[Mark Kettenis <kettenis at chello dot nl>]

Committed,

Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* vaxbsd-nat.c: Include <sys/types.h>, <machine/pcb.h> and
	"bsd-kvm.h".
	(vaxbsd_supply_pcb): New function.
	(_initialize_vaxbsd_nat): New prototype and function.
	* config/vax/nbsdaout.mh (NATDEPFILES): Add bsd-kvm.o, solib.o and
	solib-sunos.o.
	(LOADLIBES): New variable.
	* config/vax/nbsdelf.mh (NATDEPFILES): Add bsd-kvm.o.
	(LOADLIBES): New variable.
	* config/vax/obsd.mh (NATDEPFILES): Add bsd-kvm.o.
	(LOADLIBES): New variable.
	* Makefile.in (vaxbsd-nat.o): Update dependencies.

Index: vaxbsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/vaxbsd-nat.c,v
retrieving revision 1.2
diff -u -p -r1.2 vaxbsd-nat.c
--- vaxbsd-nat.c 24 May 2004 08:13:40 -0000 1.2
+++ vaxbsd-nat.c 17 Jul 2004 10:58:12 -0000
@@ -92,3 +92,47 @@ store_inferior_registers (int regnum)
 	      (PTRACE_ARG3_TYPE) &regs, 0) == -1)
     perror_with_name ("Couldn't write registers");
 }
+
+
+/* Support for debugging kernel virtual memory images.  */
+
+#include <sys/types.h>
+#include <machine/pcb.h>
+
+#include "bsd-kvm.h"
+
+static int
+vaxbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb)
+{
+  int regnum;
+
+  /* The following is true for OpenBSD 3.5:
+
+     The pcb contains the register state at the context switch inside
+     cpu_switch().  */
+
+  /* The stack pointer shouldn't be zero.  */
+  if (pcb->KSP == 0)
+    return 0;
+
+  for (regnum = VAX_R0_REGNUM; regnum < VAX_AP_REGNUM; regnum++)
+    regcache_raw_supply (regcache, regnum, &pcb->R[regnum - VAX_R0_REGNUM]);
+  regcache_raw_supply (regcache, VAX_AP_REGNUM, &pcb->AP);
+  regcache_raw_supply (regcache, VAX_FP_REGNUM, &pcb->FP);
+  regcache_raw_supply (regcache, VAX_SP_REGNUM, &pcb->KSP);
+  regcache_raw_supply (regcache, VAX_PC_REGNUM, &pcb->PC);
+  regcache_raw_supply (regcache, VAX_PS_REGNUM, &pcb->PSL);
+
+  return 1;
+}
+
+
+/* Provide a prototype to silence -Wmissing-prototypes.  */
+void _initialize_vaxbsd_nat (void);
+
+void
+_initialize_vaxbsd_nat (void)
+{
+  /* Support debugging kernel virtual memory images.  */
+  bsd_kvm_add_target (vaxbsd_supply_pcb);
+}
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.594
diff -u -p -r1.594 Makefile.in
--- Makefile.in 3 Jul 2004 15:14:47 -0000 1.594
+++ Makefile.in 17 Jul 2004 10:58:15 -0000
@@ -2566,7 +2566,8 @@ vax-tdep.o: vax-tdep.c $(defs_h) $(arch_
 	$(frame_base_h) $(frame_unwind_h) $(gdbcore_h) $(osabi_h) \
 	$(regcache_h) $(regset_h) $(value_h) $(trad_frame_h) \
 	$(gdb_string_h) $(vax_tdep_h)
-vaxbsd-nat.o: vaxbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) $(vax_tdep_h)
+vaxbsd-nat.o: vaxbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
+	$(vax_tdep_h) $(bsd_kvm_h)
 vaxnbsd-tdep.o: vaxnbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \
 	$(vax_tdep_h) $(solib_svr4_h) $(gdb_string_h)
 win32-nat.o: win32-nat.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) \
Index: config/vax/nbsdaout.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/vax/nbsdaout.mh,v
retrieving revision 1.1
diff -u -p -r1.1 nbsdaout.mh
--- config/vax/nbsdaout.mh 14 Apr 2004 19:19:11 -0000 1.1
+++ config/vax/nbsdaout.mh 17 Jul 2004 10:58:15 -0000
@@ -1,4 +1,6 @@
 # Host: NetBSD/vax a.out
-NATDEPFILES= vaxbsd-nat.o fork-child.o infptrace.o inftarg.o \
+NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o \
 	solib.o solib-sunos.o
 NAT_FILE= nm-nbsdaout.h
+
+LOADLIBES= -lkvm
Index: config/vax/nbsdelf.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/vax/nbsdelf.mh,v
retrieving revision 1.3
diff -u -p -r1.3 nbsdelf.mh
--- config/vax/nbsdelf.mh 14 Apr 2004 19:19:12 -0000 1.3
+++ config/vax/nbsdelf.mh 17 Jul 2004 10:58:15 -0000
@@ -1,3 +1,5 @@
 # Host: NetBSD/vax ELF
-NATDEPFILES= vaxbsd-nat.o fork-child.o infptrace.o inftarg.o
+NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
 NAT_FILE= nm-nbsd.h
+
+LOADLIBES= -lkvm
Index: config/vax/obsd.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/vax/obsd.mh,v
retrieving revision 1.1
diff -u -p -r1.1 obsd.mh
--- config/vax/obsd.mh 15 Apr 2004 15:10:01 -0000 1.1
+++ config/vax/obsd.mh 17 Jul 2004 10:58:15 -0000
@@ -1,3 +1,5 @@
 # Host: OpenBSD/vax
-NATDEPFILES= vaxbsd-nat.o fork-child.o infptrace.o inftarg.o
+NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
 NAT_FILE= nm-obsd.h
+
+LOADLIBES= -lkvm