* vax-nat.c: New file.

* vaxbsd-nat.c: Tweak comment.
* Makefile.in (ALLDEPFILES): Add vax-nat.c, vaxbsd-nat.c and
vaxnbsd-tdep.c.
(vax-nat.o): New dependency.
* configure.host (vax-*-bsd*, vax-*-ultrix*): Set gdb_host to vax.
(vax-*-ultrix2*): Remove.
* config/vax/vax.mh: New file.
* config/vax/nm-vax.h (vax_kernel_u_addr): New extern declaration.
(KERNEL_U_ADDR): Define as vax_kernel_u_addr.
(vax_register_u_addr): New prototype.
(REGISTER_U_ADDR): Define using vax_register_u_addr.
* config/vax/vaxult2.mh: Remove file.
* config/vax/vaxult.mh: Remove file.
* config/vax/vaxbsd.mh: Remove file.
* config/vax/vax.mt (TM_FILE): Remove.
* config/vax/tm-vaxbsd.h: Remove file.

6 files changed, 15 insertions, 70 deletions

diff --git a/gdb/config/vax/nm-vax.h b/gdb/config/vax/nm-vax.h
index b1d73b6ab59..78313cacaf8 100644
--- a/gdb/config/vax/nm-vax.h
+++ b/gdb/config/vax/nm-vax.h
@@ -1,5 +1,6 @@
-/* Common definitions for GDB native support on Vaxen under 4.2bsd and Ultrix.
-   Copyright (C) 1986, 1987, 1989, 1992 Free Software Foundation, Inc.
+/* Native-dependent definitions for VAXen under 4.2 BSD and ULTRIX.
+
+   Copyright 1986, 1987, 1989, 1992, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,16 +19,14 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#define AP_REGNUM 12	/* XXXJRT */
+#ifndef NM_VAX_H
+#define NM_VAX_H
+
+extern CORE_ADDR vax_kernel_u_addr;
+#define KERNEL_U_ADDR vax_kernel_u_addr
 
-/* This is the amount to subtract from u.u_ar0
-   to get the offset in the core file of the register values.  */
-#define KERNEL_U_ADDR (0x80000000 - (UPAGES * NBPG))
+extern CORE_ADDR vax_register_u_addr (CORE_ADDR u_ar0, int regnum);
+#define REGISTER_U_ADDR(addr, u_ar0, regnum) \
+  (addr) = vax_register_u_addr (u_ar0, regnum)
 
-#define REGISTER_U_ADDR(addr, blockend, regno)		\
-{ addr = blockend - 0110 + regno * 4;			\
-  if (regno == PC_REGNUM) addr = blockend - 8;		\
-  if (regno == PS_REGNUM) addr = blockend - 4;		\
-  if (regno == DEPRECATED_FP_REGNUM) addr = blockend - 0120;	\
-  if (regno == AP_REGNUM) addr = blockend - 0124;	\
-  if (regno == SP_REGNUM) addr = blockend - 20; }
+#endif /* nm-vax.h */
diff --git a/gdb/config/vax/tm-vaxbsd.h b/gdb/config/vax/tm-vaxbsd.h
deleted file mode 100644
index d9c97467ef2..00000000000
--- a/gdb/config/vax/tm-vaxbsd.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Definitions to make GDB run on a vax under 4.2bsd.
-
-   Copyright 1986, 1987, 1989, 1991, 1993, 1994, 1996, 1998, 1999,
-   2000, 2002, 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.  */
-
-#ifndef TM_VAXBSD_H
-#define TM_VAXBSD_H
-
-#define TARGET_UPAGES 14
-#define TARGET_NBPG 512
-#define STACK_END_ADDR (0x80000000 - (TARGET_UPAGES * TARGET_NBPG))
-
-/* On the VAX, sigtramp is in the u area.  Can't check the exact
-   addresses because for cross-debugging we don't have VAX include
-   files around.  This should be close enough.  */
-#define DEPRECATED_IN_SIGTRAMP(PC,FUNC_NAME) \
-((PC) >= (STACK_END_ADDR) && (PC) < (0x80000000))
-
-#endif /* TM_VAXBSD_H */
diff --git a/gdb/config/vax/vaxult.mh b/gdb/config/vax/vax.mh
index b85e9ec912a..5ac1c0eb68a 100644
--- a/gdb/config/vax/vaxult.mh
+++ b/gdb/config/vax/vax.mh
@@ -1,4 +1,3 @@
-# Host: DEC VAX running Ultrix
-
-NAT_FILE= nm-vax.h
+# Host: VAX running 4.2BSD or Ultrix
 NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
+NAT_FILE= nm-vax.h
diff --git a/gdb/config/vax/vax.mt b/gdb/config/vax/vax.mt
index 06ab9b2b821..4d7af45813b 100644
--- a/gdb/config/vax/vax.mt
+++ b/gdb/config/vax/vax.mt
@@ -1,3 +1,2 @@
-# Target: DEC VAX running BSD or Ultrix
+# Target: VAX running 4.2BSD or Ultrix
 TDEPFILES= vax-tdep.o
-TM_FILE= tm-vaxbsd.h
diff --git a/gdb/config/vax/vaxbsd.mh b/gdb/config/vax/vaxbsd.mh
deleted file mode 100644
index 4f0667b1182..00000000000
--- a/gdb/config/vax/vaxbsd.mh
+++ /dev/null
@@ -1,12 +0,0 @@
-# Host: DEC VAX running BSD
-
-# The following types of /bin/cc failures have been observed:
-# 1.  Something in readline.c which I have never seen
-# 2.  ``"values.c", line 816: compiler error: schain botch''
-#msg /bin/cc has been known to fail on VAXen running BSD4.3
-#msg If this occurs, use gcc
-#msg  (but see comments in Makefile.dist about compiling with gcc).
-
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o
-
-NAT_FILE= nm-vax.h
diff --git a/gdb/config/vax/vaxult2.mh b/gdb/config/vax/vaxult2.mh
deleted file mode 100644
index b85e9ec912a..00000000000
--- a/gdb/config/vax/vaxult2.mh
+++ /dev/null
@@ -1,4 +0,0 @@
-# Host: DEC VAX running Ultrix
-
-NAT_FILE= nm-vax.h
-NATDEPFILES= infptrace.o inftarg.o fork-child.o corelow.o core-aout.o