From 1ab82193844976727b3f5e46e52815fa54692e8e Mon Sep 17 00:00:00 2001
From: ragge <ragge@NetBSD.org>
Date: Wed, 5 Jul 1995 08:17:16 +0000
Subject: [PATCH] DDB file added.

---
 sys/arch/vax/conf/GENERIC      |  5 ++-
 sys/arch/vax/conf/Makefile.vax | 74 +++-------------------------------
 sys/arch/vax/conf/files.vax    |  3 +-
 3 files changed, 10 insertions(+), 72 deletions(-)

diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index c257aba2a76a..c619cc061bdf 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.6 1995/03/29 22:50:47 ragge Exp $
+#	$NetBSD: GENERIC,v 1.7 1995/07/05 08:17:16 ragge Exp $
 #
 # GENERIC VAX, currently only supports 11/750 anyway.
 #
@@ -19,7 +19,7 @@ maxusers	16
 options		SWAPPAGER, DEVPAGER, VNODEPAGER
 
 # Kernel compiled-in symbolic debugger & system call tracer
-#options		DDB
+options		DDB
 options		KTRACE
 
 # Network support
@@ -30,6 +30,7 @@ options         ETHER
 options		FFS,QUOTA
 options		LFS
 options		MFS
+options		NFSCLIENT
 options		FDESC
 options		FIFO
 options		KERNFS
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index e35eac07ac26..e60df9bc62c4 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.vax,v 1.9 1995/06/24 21:14:40 christos Exp $
+#	$NetBSD: Makefile.vax,v 1.10 1995/07/05 08:17:17 ragge Exp $
 
 #	@(#)Makefile.vax	7.18 (Berkeley) 12/16/90
 #
@@ -19,7 +19,6 @@
 # -DQUOTA	compile in file system quotas
 # -DUUDMA	compile in unibus tu58 pseudo-dma code
 #
-C2=	/usr/libexec/cc1
 CC=	cc
 CPP=	cpp
 LD=	/usr/bin/ld
@@ -29,16 +28,11 @@ S=	../../../..
 VAX=	../..
 
 INCLUDES= -I. -I$S/arch -I$S -I$S/sys
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL
+COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -D_VAX_INLINE_
 AOPTS=  ${COPTS} -DASSEMBLER
 CFLAGS=	${COPTS}
 LOAD_ADDRESS=80000000
 
-INLINECMD=	${VAX}/inline/obj/inline
-INLINE= ${INLINECMD} ${INLINEOPTS}
-
-#AHEADS=	${VAX}/vax/pcb.m
-
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
 .ifndef PROF
@@ -47,14 +41,6 @@ LIBKERN=	${KERNLIB}
 LIBKERN=        ${KERNLIB_PROF}
 .endif
 
-### find out what to use for libcompat
-.include "$S/compat/common/Makefile.inc"
-.ifndef PROF
-LIBCOMPAT=	${COMPATLIB}
-.else
-LIBCOMPAT=	${COMPATLIB_PROF}
-.endif
-
 NORMAL_C= ${CC} -O -c ${CFLAGS} ${PROF} $<
 NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${PARAM} $<
 NORMAL_S= ${CC} -x assembler-with-cpp -E -I. -DLOCORE ${COPTS} $< | \
@@ -80,7 +66,7 @@ SYSTEM_LD_TAIL=@echo Nu {r k{rnan klar!!!!
 
 clean::
 	rm -f eddep *vmunix tags *.o subr.i [a-tv-z]*.s \
-		Errs errs linterrs makelinks vnode_if.* genassym
+	Errs errs linterrs makelinks vnode_if.* genassym
 
 lint: /tmp param.c
 	@lint -hbxn -DGENERIC ${COPTS} ${PARAM} \
@@ -92,70 +78,20 @@ symbols.sort: ${VAX}/vax/symbols.raw
 	grep -v '^#' ${VAX}/vax/symbols.raw \
 	    | sed 's/^	//' | sort -u > symbols.sort
 
-${INLINECMD}:
-	cd ${VAX}/inline; make
-
 intvec.o: ${VAX}/vax/intvec.s
 	${CC} -x assembler-with-cpp -E ${AOPTS} ${VAX}/vax/intvec.s| as -o intvec.o
 
 subr.o: ${VAX}/vax/subr.s
 	${CC} -x assembler-with-cpp -E ${AOPTS} ${VAX}/vax/subr.s| as -o subr.o
 
-#
-# Den h{r filen borde st{das upp och fixas till, det blir nog n{r 
-# glue-filerna g|r vad dom ska :)
 
-#emulate.o: ${VAX}/vax/emulate.s
-#	cpp -I. ${COPTS} ${VAX}/vax/emulate.s | ${AS} -o emulate.o
-
-# the following is necessary because autoconf.o depends on #if GENERIC
-#autoconf.o tu.o: Makefile
-
-# the following are necessary because the files depend on the types of
-# vax cpu's included in the system configuration
-#clock.o machdep.o autoconf.o conf.o cons.o cpudata.o : Makefile
-#crl.o flp.o mba.o uba.o vaxcpu.o : Makefile
-
-# depend on network configuration
-#af.o uipc_proto.o uipc_domain.o subr.o: Makefile
-lim.o: Makefile
-
-# depends on kdb being configured
-#trap.o:	Makefile
-
-# depend on maxusers
-assym.s: Makefile
-
-assym.s: genassym
-	./genassym >assym.s
-
-genassym:
-	${CC} ${INCLUDES} ${IDENT} ${PARAM} -o genassym ${VAX}/vax/genassym.c
-
-depend: assym.s ${CFILES}
+depend: ${CFILES}
 	mkdep ${COPTS} ${.ALLSRC:M*.c} ioconf.c
-	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${VAX}/vax/genassym.c
-
-links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
-	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
-	  sort -u | comm -23 - dontlink | \
-	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	echo 'rm -f udiv.o;ln -s ../GENERIC/udiv.o udiv.o' >> makelinks
-	echo 'rm -f urem.o;ln -s ../GENERIC/urem.o urem.o' >> makelinks
-	sh makelinks && rm -f dontlink
-
-tags:
-	@echo "see $S/kern/Makefile for tags"
+	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM}
 
 ioconf.o:
 	${CC} -c ${CFLAGS} ${PARAM} ioconf.c
 
-#	${CC} -c -S ${COPTS} ioconf.c
-#	cat ioconf.s | ${INLINE} | ${AS} -o ioconf.o
-#	rm -f ioconf.s
-
 lim.o:	Makefile
 	../../conf/mkoldconf.awk < ioconf.c > lim.c
 	${CC} -O -c ${CFLAGS} ${PARAM} lim.c
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 7cce2b54569a..aeb6d8666d51 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-#       $NetBSD: files.vax,v 1.11 1995/06/16 15:09:56 ragge Exp $
+#       $NetBSD: files.vax,v 1.12 1995/07/05 08:17:18 ragge Exp $
 #
 # new style config file for vax architecture
 #
@@ -214,6 +214,7 @@ file	arch/vax/vax/random.s		inet
 file	arch/vax/vax/disksubr.c		ffs
 file	arch/vax/if/if_uba.c		de qe
 file	arch/vax/vax/db_machdep.c	ddb
+file	arch/vax/vax/db_disasm.c	ddb
 
 # Dom h{ra f}r vara kvar s} l{nge f}r vi se vilka vi beh|ver...
 #arch/vax/vax/crl.c           standard