This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[COMMIT] Convert *BSD/vax to use target vector inheritance
- From: Mark Kettenis <kettenis at gnu dot org>
- To: gdb-patches at sources dot redhat dot com
- Date: Thu, 30 Sep 2004 23:04:39 +0200 (CEST)
- Subject: [COMMIT] Convert *BSD/vax to use target vector inheritance
And another one.
Mark
Index: ChangeLog
from Mark Kettenis <kettenis@gnu.org>
* vaxbsd-nat.c: Include "target,h" and "inf-ptrace.h".
(vaxbsd_fetch_inferior_registers): Rename from
fetch_inferior_registers. Make static.
(vaxbsd_store_inferior_registers): Rename from
store_inferior_registers. Make static.
(_initialize_vaxbsd_nat): Construct and add target vector.
* config/vax/nbsdaout.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o. Add inf-child.o and inf-ptrace.o.
* config/vax/nbsdelf.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o. Add inf-child.o and inf-ptrace.o.
(NAT_FILE): Remove.
* config/vax/obsd.mh (NATDEPFILES): Remove infptrace.o and
inftarg.o. Add inf-child.o and inf-ptrace.o.
(NAT_FILE): Remove.
* Makefile.in (vaxbsd-nat.o): Update dependencies.
Index: vaxbsd-nat.c
===================================================================
RCS file: /cvs/src/src/gdb/vaxbsd-nat.c,v
retrieving revision 1.5
diff -u -p -r1.5 vaxbsd-nat.c
--- vaxbsd-nat.c 14 Aug 2004 23:37:04 -0000 1.5
+++ vaxbsd-nat.c 30 Sep 2004 21:02:40 -0000
@@ -22,12 +22,14 @@
#include "defs.h"
#include "inferior.h"
#include "regcache.h"
+#include "target.h"
#include <sys/types.h>
#include <sys/ptrace.h>
#include <machine/reg.h>
#include "vax-tdep.h"
+#include "inf-ptrace.h"
/* Supply the general-purpose registers stored in GREGS to REGCACHE. */
@@ -62,8 +64,8 @@ vaxbsd_collect_gregset (const struct reg
/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this
for all registers. */
-void
-fetch_inferior_registers (int regnum)
+static void
+vaxbsd_fetch_inferior_registers (int regnum)
{
struct reg regs;
@@ -77,8 +79,8 @@ fetch_inferior_registers (int regnum)
/* Store register REGNUM back into the inferior. If REGNUM is -1, do
this for all registers. */
-void
-store_inferior_registers (int regnum)
+static void
+vaxbsd_store_inferior_registers (int regnum)
{
struct reg regs;
@@ -133,6 +135,13 @@ void _initialize_vaxbsd_nat (void);
void
_initialize_vaxbsd_nat (void)
{
+ struct target_ops *t;
+
+ t = inf_ptrace_target ();
+ t->to_fetch_registers = vaxbsd_fetch_inferior_registers;
+ t->to_store_registers = vaxbsd_store_inferior_registers;
+ add_target (t);
+
/* 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.632
diff -u -p -r1.632 Makefile.in
--- Makefile.in 30 Sep 2004 20:52:59 -0000 1.632
+++ Makefile.in 30 Sep 2004 21:02:44 -0000
@@ -2655,7 +2655,7 @@ values.o: values.c $(defs_h) $(gdb_strin
varobj.o: varobj.c $(defs_h) $(value_h) $(expression_h) $(frame_h) \
$(language_h) $(wrapper_h) $(gdbcmd_h) $(gdb_string_h) $(varobj_h)
vaxbsd-nat.o: vaxbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
- $(vax_tdep_h) $(bsd_kvm_h)
+ $(target_h) $(vax_tdep_h) $(inf_ptrace_h) $(bsd_kvm_h)
vax-nat.o: vax-nat.c $(defs_h) $(inferior_h) $(gdb_assert_h) $(vax_tdep_h)
vaxnbsd-tdep.o: vaxnbsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \
$(vax_tdep_h) $(solib_svr4_h) $(gdb_string_h)
Index: config/vax/nbsdaout.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/vax/nbsdaout.mh,v
retrieving revision 1.2
diff -u -p -r1.2 nbsdaout.mh
--- config/vax/nbsdaout.mh 17 Jul 2004 11:03:49 -0000 1.2
+++ config/vax/nbsdaout.mh 30 Sep 2004 21:02:44 -0000
@@ -1,5 +1,6 @@
# Host: NetBSD/vax a.out
-NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o \
+NATDEPFILES= fork-child.o inf-child.o inf-ptrace.o \
+ vaxbsd-nat.o bsd-kvm.o \
solib.o solib-sunos.o
NAT_FILE= nm-nbsdaout.h
Index: config/vax/nbsdelf.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/vax/nbsdelf.mh,v
retrieving revision 1.5
diff -u -p -r1.5 nbsdelf.mh
--- config/vax/nbsdelf.mh 3 Sep 2004 19:08:22 -0000 1.5
+++ config/vax/nbsdelf.mh 30 Sep 2004 21:02:44 -0000
@@ -1,5 +1,5 @@
# Host: NetBSD/vax ELF
-NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= config/nm-nbsd.h
+NATDEPFILES= fork-child.o inf-child.o inf-ptrace.o \
+ vaxbsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm
Index: config/vax/obsd.mh
===================================================================
RCS file: /cvs/src/src/gdb/config/vax/obsd.mh,v
retrieving revision 1.3
diff -u -p -r1.3 obsd.mh
--- config/vax/obsd.mh 3 Sep 2004 19:08:23 -0000 1.3
+++ config/vax/obsd.mh 30 Sep 2004 21:02:44 -0000
@@ -1,5 +1,5 @@
# Host: OpenBSD/vax
-NATDEPFILES= vaxbsd-nat.o bsd-kvm.o fork-child.o infptrace.o inftarg.o
-NAT_FILE= config/nm-bsd.h
+NATDEPFILES= fork-child.o inf-child.o inf-ptrace.o \
+ vaxbsd-nat.o bsd-kvm.o
LOADLIBES= -lkvm