Third try at importing the mvme88k port. This is a working kernel

from nivas.
Userland and compiler still need to be worked on.
Make certain what directory the import is done from.

5 files changed, 539 insertions, 0 deletions

diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
new file mode 100644
index 00000000000..a3454cc9819
--- /dev/null
+++ b/sys/arch/mvme88k/conf/M187
@@ -0,0 +1,129 @@
+#
+# This configuration file contains all possible options
+#
+
+machine m88k
+
+maxusers 8
+
+options		TIMEZONE=300, DST=1
+
+#
+# processors this kernel should support
+#
+options		"M88000"	# support for 88K
+options		MVME187		# support for 187
+
+options		SWAPPAGER	# Pager for processes (Required)
+options		VNODEPAGER	# Pager for vnodes (Required)
+options		DEVPAGER	# Pager for devices (Required)
+
+options		SYSVSHM
+options		SYSVSEM
+options		SYSVMSG
+
+#options		CD9660		# ISO 9660 + Rock Ridge file system
+#options		MSDOSFS		# MS-DOS file system
+options		FDESC		# /dev/fd
+#options		FIFO		# FIFOs; RECOMMENDED
+options		KERNFS		# /kern
+options		NULLFS		# loopback file system
+#options		PORTAL		# ?
+options		PROCFS		# /proc
+#options		UMAPFS		# NULLFS + uid and gid remapping
+options		UNION		# union file system
+#
+# Networking options
+options		INET
+options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+#options	GATEWAY		# IP packet forwarding
+#options	ISO		# OSI networking
+#options	TPIP
+#options	EON
+options		COMPAT_43
+options		EXEC_COFF
+
+options		LKM
+
+#
+
+#
+# File system related options
+#
+#options		QUOTA		# Disk quotas for local disks
+#options		NFSSERVER	# Network File System server side code
+#options		NFSCLIENT	# Network File System client side code
+
+#
+# File systems
+#
+options		FFS		# Berkeley fast file system
+options		MFS		# Memory based filesystem
+options		FIFO		# FIFO operations on vnodes (Recommended)
+
+#
+# Compatability options for various existing systems
+#
+#options		"COMPAT_NOMID"	# allow nonvalid machine id executables
+
+#
+# Support for System V IPC facilities.
+#
+
+#
+# Support for various kernel options
+#
+#options		DIAGNOSTIC	# Add additional error checking code
+options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+
+#
+# Misc. debuging options
+#
+options		PANICWAIT	# Require keystroke to dump/reboot
+#options		DEBUG		# Add debugging statements
+options		DDB		# Kernel debugger
+options		SYSCALL_DEBUG	# debug all syscalls.
+options		KTRACE		# debug all syscalls.
+
+#
+# devices
+#
+mainbus0 at root
+# mainbus devices
+#sram0	at mainbus0 addr 0xffe00000
+vme0	at mainbus0 addr 0xfff40000
+pcctwo0 at mainbus0 addr 0xfff42000
+# pcctwo devices
+clock0	at pcctwo0 addr 0xfff42000 ipl 5
+nvram0	at pcctwo0 addr 0xfffc0000 size 0x10000
+ie0	at pcctwo0 addr 0xfff46000 ipl 3 size 0x1000
+cl0	at pcctwo0 addr 0xfff45000 ipl 4 size 0x200
+siop0	at pcctwo0 addr 0xfff47000 ipl 2 size 0x1000
+#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
+#mcecc0	at pcctwo0 addr 0xfff43000
+#mcecc1	at pcctwo0 addr 0xfff43100
+#memc0	at pcctwo0 addr 0xfff43000
+#memc1	at pcctwo0 addr 0xfff43100
+
+bugtty0 at mainbus0
+
+#vme0 devices
+vmes0	at vme0
+vmel0	at vme0
+
+scsibus* at siop?
+#
+#sd0	at scsibus? target 0 lun 0
+#sd1	at scsibus? target 2 lun 0
+sd*	at scsibus? target ? lun ?
+st*	at scsibus? target ? lun ?
+cd*	at scsibus? target ? lun ?
+
+pseudo-device	vnd 2
+pseudo-device	bpfilter
+pseudo-device	sl			# slip
+pseudo-device	ppp 2			# ppp
+pseudo-device	pty 16			# pseudo terminals
+pseudo-device	loop			# network loopback
+
+config	netbsd root on sd1 swap on sd1
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
new file mode 100644
index 00000000000..8281022afc6
--- /dev/null
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -0,0 +1,180 @@
+#	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
+#	$Id: Makefile.mvme88k,v 1.1 1997/03/03 19:31:53 rahnds Exp $
+#
+# Makefile for NetBSD
+#
+# This makefile is constructed from a machine description:
+#	config machineid
+# Most changes should be made in the machine description
+#	/sys/arch/mvme88k/conf/``machineid''
+# after which you should do
+#	 config machineid
+# Machine generic makefile changes should be made in
+#	/sys/arch/mvme88k/conf/Makefile.mvme88k
+# after which config should be rerun for all machines of that type.
+#
+# N.B.: NO DEPENDENCIES ON FOLLOWING FLAGS ARE VISIBLE TO MAKEFILE
+#	IF YOU CHANGE THE DEFINITION OF ANY OF THESE RECOMPILE EVERYTHING
+#
+# -DTRACE	compile in kernel tracing hooks
+# -DQUOTA	compile in file system quotas
+
+
+# DEBUG is set to -g by config if debugging is requested (config -g).
+# PROF is set to -pg by config if profiling is requested (config -p).
+AS=     as ${DEBUG}
+AWK=	awk
+CC=     cc ${DEBUG}
+CPP=    cpp
+LD=     ld
+TOUCH=	touch -f -c
+
+.ifndef HOSTCC
+HOSTCC=cc
+.endif
+
+# source tree is located via $S relative to the compilation directory
+S=	../../../..
+MVME88K=	../..
+
+INCLUDES= -I. -I$S/arch -I$S -I$S/sys 
+.if defined(DESTDIR)
+INCLUDES+= -nostdinc -idirafter ${DESTDIR}/usr/include
+.endif
+CPPFLAGS=	${INCLUDES} ${IDENT} -DKERNEL -D_KERNEL -Dmvme88k -Dm88k
+CFLAGS=	-O ${DEBUG} #-Werror
+
+### find out what to use for libkern
+.include "$S/lib/libkern/Makefile.inc"
+.ifndef PROF
+LIBKERN=	${KERNLIB}
+.else
+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
+
+# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
+# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
+# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
+# is marked as config-dependent.
+
+NORMAL_C=	${CC} -c ${CFLAGS} ${CPPFLAGS} ${PROF} $<
+NORMAL_C_C=	${CC} -c ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} $<
+
+DRIVER_C=	${CC} -c ${CFLAGS} ${CPPFLAGS} ${PROF} $<
+DRIVER_C_C=	${CC} -c ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} $<
+
+PROFILE_C=	${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \
+		sed -e s/_mcount/mcount/ -e s/subrmcount/subr_mcount/ <$*.s | \
+		${AS} -o $@; \
+		rm -f $*.s
+
+NORMAL_S=	${CC} -E ${CFLAGS} ${CPPFLAGS} $< | ${AS} -o $@
+NORMAL_S_C=	${CC} -E ${CFLAGS} ${CPPFLAGS} ${PARAM} $< | ${AS} -o $@
+
+%OBJS
+
+%CFILES
+
+# load lines for config "xxx" will be emitted as:
+# xxx: ${SYSTEM_DEP} swapxxx.o
+#	${SYSTEM_LD_HEAD}
+#	${SYSTEM_LD} swapxxx.o
+#	${SYSTEM_LD_TAIL}
+# Kernel is linked as a ZMAGIC executable, with start at 10020
+SYSTEM_OBJ=	locore.o ${OBJS} param.o ioconf.o \
+		${LIBKERN} ${LIBCOMPAT}
+SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
+SYSTEM_LD_HEAD=	@echo loading $@; rm -f $@
+SYSTEM_LD=	-@if [ X${DEBUG} = X-g ]; \
+		then strip=-X; \
+		else strip=-x; \
+		fi; \
+		echo ${LD} $$strip -Ttext 0x10000 -o $@ ${SYSTEM_OBJ} libgcc.a vers.o; \
+		${LD} $$strip -Ttext 0x10000 -e start -o $@ ${SYSTEM_OBJ} \
+			libgcc.a vers.o
+
+SYSTEM_LD_TAIL=	@size $@; chmod 755 $@; \
+		[ X${DEBUG} = X-g ] && { \
+		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
+		echo strip -d $@; strip -d $@; } || true
+
+%LOAD
+
+assym.s: genassym
+	./genassym >assym.s
+	cp assym.s ${.CURDIR}/../../include
+
+genassym:
+	${HOSTCC} -static ${INCLUDES} ${IDENT} ${PARAM} -Dmvme88k -Dm88k \
+	    -o genassym ${MVME88K}/mvme88k/genassym.c
+
+vers.o:	newvers
+
+newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+	sh $S/conf/newvers.sh
+	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
+
+clean::
+	rm -f eddep *bsd bsd.gdb tags *.o locore.i \
+		[a-z]*.s [Ee]rrs errs linterrs makelinks
+
+lint: /tmp param.c
+	@lint -hbxn -DGENERIC -Dvolatile= ${CFLAGS} ${CPPFLAGS} ${PARAM} -UKGDB \
+	    ${MVME88K}/mvme88k/Locore.c ${CFILES} ${MVME88K}/mvme88k/swapgeneric.c \
+	    ioconf.c param.c| \
+	    grep -v 'struct/union .* never defined' | \
+	    grep -v 'possible pointer alignment problem'
+
+locore.o: assym.s ${MVME88K}/mvme88k/eh.S ${MVME88K}/mvme88k/locore.S 
+locore.o: machine/trap.h machine/psl.h machine/cpu.h
+	${CPP} -DLOCORE ${CPPFLAGS} ${MVME88K}/mvme88k/locore.S | ${AS} -o locore.o
+
+# depend on root or device configuration
+autoconf.o conf.o: Makefile
+ 
+# depend on network or filesystem configuration 
+uipc_domain.o uipc_proto.o vfs_conf.o: Makefile 
+if_tun.o if_loop.o if_ethersubr.o: Makefile
+in_proto.o: Makefile
+
+# depend on maxusers
+genassym.o machdep.o: Makefile
+
+# depend on CPU configuration 
+locore.o machdep.o: Makefile
+
+depend:: .depend
+.depend: assym.s param.c vnode_if.h
+	mkdep ${CFLAGS} ${CPPFLAGS} ${CFILES} ioconf.c param.c
+	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${MVME88K}/mvme88k/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
+	sh makelinks && rm -f dontlink
+
+tags:
+	@echo "see $S/kern/Makefile for tags"
+
+param.c: $S/conf/param.c
+	rm -f param.c
+	cp $S/conf/param.c .
+
+param.o: param.c Makefile
+	${NORMAL_C_C}
+
+ioconf.o: ioconf.c
+	${NORMAL_C}
+
+%RULES
diff --git a/sys/arch/mvme88k/conf/NFS b/sys/arch/mvme88k/conf/NFS
new file mode 100644
index 00000000000..c39c9162e98
--- /dev/null
+++ b/sys/arch/mvme88k/conf/NFS
@@ -0,0 +1,130 @@
+#
+# This configuration file contains all possible options
+#
+
+machine mvme88k
+
+maxusers 32
+
+options		TIMEZONE=300, DST=1
+
+options		__OpenBSD__
+#
+# processors this kernel should support
+#
+options		"M88000"	# support for 88K
+options		MVME187		# support for 187
+
+options		SWAPPAGER	# Pager for processes (Required)
+options		VNODEPAGER	# Pager for vnodes (Required)
+options		DEVPAGER	# Pager for devices (Required)
+
+options		SYSVSHM
+options		SYSVSEM
+options		SYSVMSG
+
+#options		CD9660		# ISO 9660 + Rock Ridge file system
+#options		MSDOSFS		# MS-DOS file system
+options		FDESC		# /dev/fd
+#options		FIFO		# FIFOs; RECOMMENDED
+options		KERNFS		# /kern
+options		NULLFS		# loopback file system
+#options		PORTAL		# ?
+options		PROCFS		# /proc
+#options		UMAPFS		# NULLFS + uid and gid remapping
+options		UNION		# union file system
+#
+# Networking options
+options		INET
+options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+#options	GATEWAY		# IP packet forwarding
+#options	ISO		# OSI networking
+#options	TPIP
+#options	EON
+options		COMPAT_43
+options		EXEC_COFF
+
+options		LKM
+
+#
+
+#
+# File system related options
+#
+#options		QUOTA		# Disk quotas for local disks
+options		NFSSERVER	# Network File System server side code
+options		NFSCLIENT	# Network File System client side code
+
+#
+# File systems
+#
+options		FFS		# Berkeley fast file system
+options		MFS		# Memory based filesystem
+options		FIFO		# FIFO operations on vnodes (Recommended)
+
+#
+# Compatability options for various existing systems
+#
+#options		"COMPAT_NOMID"	# allow nonvalid machine id executables
+
+#
+# Support for System V IPC facilities.
+#
+
+#
+# Support for various kernel options
+#
+#options		DIAGNOSTIC	# Add additional error checking code
+options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+
+#
+# Misc. debuging options
+#
+options		PANICWAIT	# Require keystroke to dump/reboot
+#options		DEBUG		# Add debugging statements
+options		DDB		# Kernel debugger
+options		SYSCALL_DEBUG	# debug all syscalls.
+options		KTRACE		# debug all syscalls.
+
+#
+# devices
+#
+mainbus0 at root
+# mainbus devices
+#sram0	at mainbus0 addr 0xffe00000
+vme0	at mainbus0 addr 0xfff40000
+pcctwo0 at mainbus0 addr 0xfff42000
+# pcctwo devices
+clock0	at pcctwo0 addr 0xfff42000 ipl 5
+nvram0	at pcctwo0 addr 0xfffc0000 size 0x10000
+ie0	at pcctwo0 addr 0xfff46000 ipl 3 size 0x1000
+cl0	at pcctwo0 addr 0xfff45000 ipl 4 size 0x200
+siop0	at pcctwo0 addr 0xfff47000 ipl 2 size 0x1000
+#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
+#mcecc0	at pcctwo0 addr 0xfff43000
+#mcecc1	at pcctwo0 addr 0xfff43100
+#memc0	at pcctwo0 addr 0xfff43000
+#memc1	at pcctwo0 addr 0xfff43100
+
+bugtty0 at mainbus0
+
+#vme0 devices
+vmes0	at vme0
+vmel0	at vme0
+
+scsibus* at siop?
+#
+#sd0	at scsibus? target 0 lun 0
+#sd1	at scsibus? target 2 lun 0
+sd*	at scsibus? target ? lun ?
+st*	at scsibus? target ? lun ?
+cd*	at scsibus? target ? lun ?
+
+pseudo-device	vnd 2
+pseudo-device	bpfilter
+pseudo-device	sl			# slip
+pseudo-device	ppp 2			# ppp
+pseudo-device	pty 16			# pseudo terminals
+pseudo-device	loop			# network loopback
+
+config	bsd root on sd0 swap on sd0
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
new file mode 100644
index 00000000000..d619ec87595
--- /dev/null
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -0,0 +1,93 @@
+maxpartitions 16
+
+device 	mainbus { [addr = -1 ] }
+attach 	mainbus at root
+
+# this should be removed after bringup
+
+device bugtty: tty
+attach bugtty at mainbus
+file	arch/mvme88k/dev/bugtty.c			bugtty needs-count
+device cpu
+attach cpu at mainbus
+device vme { [addr = -1], [size = -1], [ipl = 0], [vec = -1] }
+attach vme at mainbus
+device pcctwo { [addr = -1], [size = 4096], [ipl = 0] }
+attach pcctwo at mainbus
+file	arch/mvme88k/dev/pcctwo.c			pcctwo needs-count
+device clock
+attach clock at pcctwo
+file	arch/mvme88k/dev/clock.c			clock
+device nvram
+attach nvram at pcctwo
+file	arch/mvme88k/dev/nvram.c			nvram
+device cl: tty
+attach cl at pcctwo
+file	arch/mvme88k/dev/cl.c				cl needs-count
+#device ether at pcctwo
+
+include "../../../scsi/files.scsi"
+
+major { sd = 4 }
+major { st = 5 }
+major { cd = 6 }
+major { vnd = 8 }
+
+device siop: scsi
+attach siop at pcctwo
+file	arch/mvme88k/dev/siop.c				siop
+file	arch/mvme88k/dev/siopdma.c			siop
+
+device vmes
+attach vmes at vme
+device vmel
+attach vmel at vme
+
+#device vme at mainbus { }
+#device vmes at vme { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
+#device vmel at vme { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
+
+file	arch/mvme88k/dev/vme.c				vme | vmes | vmel
+file	arch/mvme88k/dev/vmes.c				vmes needs-count
+file	arch/mvme88k/dev/vmel.c				vmel needs-count
+
+# list of standard files
+file	dev/cons.c					ite | ser | tty
+file	dev/cninit.c
+#file	scsi/scsi_base.c				scsi
+#file	scsi/scsi_ioctl.c				scsi
+#file	scsi/scsiconf.c					scsi
+
+file	netinet/in_cksum.c
+file	netns/ns_cksum.c				ns
+
+file	arch/mvme88k/mvme88k/autoconf.c
+file	arch/mvme88k/mvme88k/conf.c
+file	arch/mvme88k/mvme88k/cmmu.c
+file	arch/mvme88k/mvme88k/disksubr.c
+file	arch/mvme88k/mvme88k/dkbad.c
+file	arch/mvme88k/mvme88k/eh.S
+file	arch/mvme88k/mvme88k/locore_asm_routines.S
+file	arch/mvme88k/mvme88k/locore_c_routines.c
+file	arch/mvme88k/mvme88k/m88100_fp.S
+file	arch/mvme88k/mvme88k/machdep.c
+file	arch/mvme88k/mvme88k/mem.c
+file	arch/mvme88k/mvme88k/pmap.c
+file	arch/mvme88k/mvme88k/process.S
+file	arch/mvme88k/mvme88k/process_machdep.c
+file	arch/mvme88k/mvme88k/trap.c
+file	arch/mvme88k/mvme88k/vm_machdep.c
+
+file	arch/mvme88k/ddb/db_disasm.c
+file	arch/mvme88k/ddb/db_interface.c
+file	arch/mvme88k/ddb/db_sstep.c
+file	arch/mvme88k/ddb/db_trace.c
+
+file	arch/mvme88k/dev/mainbus.c
+file	arch/mvme88k/dev/bugio.c
+
+
+device ie: ifnet, ether
+attach ie at pcctwo: ifnet, ether
+file    arch/mvme88k/dev/if_ie.c			ie
+
diff --git a/sys/arch/mvme88k/conf/std.mvme88k b/sys/arch/mvme88k/conf/std.mvme88k
new file mode 100644
index 00000000000..e7d3749bdf5
--- /dev/null
+++ b/sys/arch/mvme88k/conf/std.mvme88k
@@ -0,0 +1,7 @@
+# standard amiga information
+#	$Id: std.mvme88k,v 1.1 1997/03/03 19:31:52 rahnds Exp $
+machine mvme88k
+
+mainbus0	at root
+#pcc0		at mainbus0
+#scsi0		at pcc0