Module Name: src
Committed By: jmcneill
Date: Tue Dec 20 21:01:39 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: Makefile.usermode files.usermode
majors.usermode std.usermode
src/sys/arch/usermode/usermode: machdep.c pmap.c
Added Files:
src/sys/arch/usermode/conf: GENERIC.common GENERIC.i386
Removed Files:
src/sys/arch/usermode/conf: GENERIC GENERIC32
src/sys/arch/usermode/include: urkelvisor.h
src/sys/arch/usermode/usermode: urkelvisor.c
Log Message:
get rid of urkelvisor, and use same MD majors as the host
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r0 src/sys/arch/usermode/conf/GENERIC
cvs rdiff -u -r0 -r1.1 src/sys/arch/usermode/conf/GENERIC.common \
src/sys/arch/usermode/conf/GENERIC.i386
cvs rdiff -u -r1.2 -r0 src/sys/arch/usermode/conf/GENERIC32
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/conf/files.usermode
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/conf/majors.usermode
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/conf/std.usermode
cvs rdiff -u -r1.1 -r0 src/sys/arch/usermode/include/urkelvisor.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/usermode/usermode/machdep.c
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/usermode/usermode/pmap.c
cvs rdiff -u -r1.9 -r0 src/sys/arch/usermode/usermode/urkelvisor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.24 src/sys/arch/usermode/conf/Makefile.usermode:1.25
--- src/sys/arch/usermode/conf/Makefile.usermode:1.24 Fri Sep 16 11:28:36 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Tue Dec 20 21:01:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.24 2011/09/16 11:28:36 jmcneill Exp $
+# $NetBSD: Makefile.usermode,v 1.25 2011/12/20 21:01:39 jmcneill Exp $
OPT_CPU_HOST= %CPU_HOST%
.if !empty(OPT_CPU_HOST)
@@ -38,7 +38,6 @@ CPPFLAGS+= -Dusermode
CPPFLAGS.init_main.c+= -Dmain=kernmain
OPT_SDL= %SDL%
-OPT_URKELVISOR= %URKELVISOR%
.if !empty(OPT_SDL)
SDL_CFLAGS!= sdl-config --cflags
@@ -48,7 +47,6 @@ USERMODE_LIBS+= -Wl,-Bdynamic ${SDL_LIBS
CPPFLAGS.thunk.c+= ${USERMODE_CPPFLAGS}
CPPFLAGS.thunk_sdl.c+= ${SDL_CFLAGS} ${USERMODE_CPPFLAGS}
-CPPFLAGS.urkelvisor.c+= ${USERMODE_CPPFLAGS}
##
## (3) libkern and compat
@@ -63,11 +61,6 @@ MD_OBJS= thunk.o
MD_CFILES= ${USERMODE}/usermode/thunk.c
MD_SFILES=
-.if !empty(OPT_URKELVISOR)
-MD_OBJS+= urkelvisor.o
-MD_CFILES+= ${USERMODE}/usermode/urkelvisor.c
-.endif
-
.if !empty(OPT_SDL)
MD_OBJS+= thunk_sdl.o
MD_CFILES+= ${USERMODE}/usermode/thunk_sdl.c
@@ -112,13 +105,6 @@ thunk_sdl.d: ${USERMODE}/usermode/thunk.
thunk_sdl.o: ${USERMODE}/usermode/thunk_sdl.c
${CC} ${CPPFLAGS.thunk_sdl.c} -c -o $@ ${USERMODE}/usermode/thunk_sdl.c
-urkelvisor.d: ${USERMODE}/usermode/urkelvisor.c
- ${MKDEP} -f ${.TARGET} -- ${MKDEP_CFLAGS} \
- ${CPPFLAGS.urkelvisor.c} ${USERMODE}/usermode/urkelvisor.c
-
-urkelvisor.o: ${USERMODE}/usermode/urkelvisor.c
- ${CC} ${CPPFLAGS.urkelvisor.c} -c -o $@ ${USERMODE}/usermode/urkelvisor.c
-
##
## (7) misc settings
##
Index: src/sys/arch/usermode/conf/files.usermode
diff -u src/sys/arch/usermode/conf/files.usermode:1.11 src/sys/arch/usermode/conf/files.usermode:1.12
--- src/sys/arch/usermode/conf/files.usermode:1.11 Fri Sep 16 11:28:36 2011
+++ src/sys/arch/usermode/conf/files.usermode Tue Dec 20 21:01:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.usermode,v 1.11 2011/09/16 11:28:36 jmcneill Exp $
+# $NetBSD: files.usermode,v 1.12 2011/12/20 21:01:39 jmcneill Exp $
maxpartitions 8
maxusers 8 16 64
@@ -8,7 +8,6 @@ defflag opt_sdl.h SDL
defflag opt_cpu.h CPU_DEBUG
defparam opt_cpu.h CPU_HOST
defparam opt_misc.h TEXTADDR
-defflag opt_urkelvisor.h URKELVISOR
define thunkbus { }
Index: src/sys/arch/usermode/conf/majors.usermode
diff -u src/sys/arch/usermode/conf/majors.usermode:1.4 src/sys/arch/usermode/conf/majors.usermode:1.5
--- src/sys/arch/usermode/conf/majors.usermode:1.4 Sun Dec 11 22:34:42 2011
+++ src/sys/arch/usermode/conf/majors.usermode Tue Dec 20 21:01:39 2011
@@ -1,15 +1,2 @@
-# $NetBSD: majors.usermode,v 1.4 2011/12/11 22:34:42 jmcneill Exp $
-
-device-major cons char 0
-device-major ctty char 1
-device-major mem char 2
-#device-major wd char 3
-device-major swap char 4 block 1 vmswap
-device-major pts char 5 pty
-device-major ptc char 6 pty
-device-major log char 7
-device-major com char 8 com
-device-major md char 24 block 17 md
-device-major wsdisplay char 47 wsdisplay
-device-major ld char 69 block 19 ld
+# $NetBSD: majors.usermode,v 1.5 2011/12/20 21:01:39 jmcneill Exp $
device-major ttycons char 159 ttycons
Index: src/sys/arch/usermode/conf/std.usermode
diff -u src/sys/arch/usermode/conf/std.usermode:1.8 src/sys/arch/usermode/conf/std.usermode:1.9
--- src/sys/arch/usermode/conf/std.usermode:1.8 Tue Dec 13 20:58:47 2011
+++ src/sys/arch/usermode/conf/std.usermode Tue Dec 20 21:01:39 2011
@@ -1,6 +1,5 @@
-# $NetBSD: std.usermode,v 1.8 2011/12/13 20:58:47 reinoud Exp $
+# $NetBSD: std.usermode,v 1.9 2011/12/20 21:01:39 jmcneill Exp $
-machine usermode
include "conf/std"
options HZ=100
@@ -8,8 +7,6 @@ options EXEC_ELF32
options EXEC_ELF64
options EXEC_SCRIPT
-options URKELVISOR
-
# Defaults
options NKMEMPAGES=4096
#options NKMEMPAGES_MAX_DEFAULT=2048
Index: src/sys/arch/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.38 src/sys/arch/usermode/usermode/machdep.c:1.39
--- src/sys/arch/usermode/usermode/machdep.c:1.38 Tue Dec 20 15:43:51 2011
+++ src/sys/arch/usermode/usermode/machdep.c Tue Dec 20 21:01:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38 2011/12/20 15:43:51 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.39 2011/12/20 21:01:39 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <[email protected]>
@@ -29,10 +29,9 @@
#include "opt_memsize.h"
#include "opt_sdl.h"
-#include "opt_urkelvisor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2011/12/20 15:43:51 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2011/12/20 21:01:39 jmcneill Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -51,10 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/machdep.h>
#include <machine/thunk.h>
-#if defined(URKELVISOR)
-#include <machine/urkelvisor.h>
-#endif
-
char machine[] = "usermode";
char machine_arch[] = "usermode";
@@ -106,10 +101,6 @@ main(int argc, char *argv[])
pmap_bootstrap();
-#if defined(URKELVISOR)
- urkelvisor_init();
-#endif
-
splinit();
splraise(IPL_HIGH);
Index: src/sys/arch/usermode/usermode/pmap.c
diff -u src/sys/arch/usermode/usermode/pmap.c:1.80 src/sys/arch/usermode/usermode/pmap.c:1.81
--- src/sys/arch/usermode/usermode/pmap.c:1.80 Tue Dec 20 15:45:37 2011
+++ src/sys/arch/usermode/usermode/pmap.c Tue Dec 20 21:01:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.80 2011/12/20 15:45:37 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.81 2011/12/20 21:01:39 jmcneill Exp $ */
/*-
* Copyright (c) 2011 Reinoud Zandijk <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.80 2011/12/20 15:45:37 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.81 2011/12/20 21:01:39 jmcneill Exp $");
#include "opt_memsize.h"
#include "opt_kmempages.h"
@@ -370,13 +370,6 @@ pmap_bootstrap(void)
void
pmap_init(void)
{
- /*
- * XXX Work around a NetBSD fork() bug that doesn't copy the alternate
- * signal stack to the child! so ensure signal stack is setup after
- * urkelvisor fork
- */
-
- thunk_sigaltstack(usermode_signal_stack(), NULL);
}
/* return kernel space start and end (including growth) */
Added files:
Index: src/sys/arch/usermode/conf/GENERIC.common
diff -u /dev/null src/sys/arch/usermode/conf/GENERIC.common:1.1
--- /dev/null Tue Dec 20 21:01:39 2011
+++ src/sys/arch/usermode/conf/GENERIC.common Tue Dec 20 21:01:39 2011
@@ -0,0 +1,61 @@
+# $NetBSD: GENERIC.common,v 1.1 2011/12/20 21:01:39 jmcneill Exp $
+
+include "arch/usermode/conf/std.usermode"
+
+options INCLUDE_CONFIG_FILE
+#ident "GENERIC-$Revision: 1.1 $"
+maxusers 32
+
+makeoptions DEBUG="-O1 -g3"
+
+options RTC_OFFSET=0
+options KTRACE
+#options USERCONF
+
+options SYSVMSG
+options SYSVSEM
+options SYSVSHM
+
+options DEBUG
+#options DDB # missing support
+options DIAGNOSTIC
+options LOCKDEBUG
+#options DEBUG_EXEC
+options CPU_DEBUG
+#options UVMHIST
+#options UVMHIST_PRINT
+
+options COMPAT_BSDPTY
+options COMPAT_50
+
+file-system FFS
+file-system MFS
+file-system FDESC
+file-system KERNFS
+file-system PROCFS
+file-system PTYFS
+file-system TMPFS
+options WAPBL
+
+options INET
+options INET6
+options NFS_BOOT_DHCP
+options NFS_BOOT_BOOTPARAM
+
+config netbsd root on ? type ?
+
+mainbus0 at root
+cpu0 at mainbus?
+clock0 at mainbus?
+ttycons0 at mainbus?
+ld0 at mainbus?
+
+#options SDL
+#genfb0 at thunkbus?
+#wsdisplay0 at genfb?
+
+pseudo-device loop
+pseudo-device pty
+
+# Pull in optional local configuration
+cinclude "arch/usermode/conf/GENERIC.local"
Index: src/sys/arch/usermode/conf/GENERIC.i386
diff -u /dev/null src/sys/arch/usermode/conf/GENERIC.i386:1.1
--- /dev/null Tue Dec 20 21:01:39 2011
+++ src/sys/arch/usermode/conf/GENERIC.i386 Tue Dec 20 21:01:39 2011
@@ -0,0 +1,17 @@
+# $NetBSD: GENERIC.i386,v 1.1 2011/12/20 21:01:39 jmcneill Exp $
+
+machine usermode
+include "arch/usermode/conf/GENERIC.common"
+include "arch/i386/conf/majors.i386"
+
+no options EXEC_ELF64
+
+options TEXTADDR=0x0f000000 # 1.5 Gb?
+options KVMSIZE=0x008000000
+
+makeoptions COPTS+="-m32"
+makeoptions LD="ld -melf_i386"
+
+#options INCLUDE_CONFIG_FILE
+#ident "GENERIC32-$Revision: 1.1 $"
+
