grown i386 kvm to 512MB

5 files changed, 20 insertions, 27 deletions

diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index 5e9ef4a8ff5..e6aae9f812d 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.i386,v 1.23 1998/08/10 22:08:27 mickey Exp $
+#	$OpenBSD: Makefile.i386,v 1.24 1999/09/17 16:52:05 deraadt Exp $
 #	$NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
 
 # Makefile for OpenBSD
@@ -50,7 +50,7 @@ CMACHFLAGS=
 
 CFLAGS=		${DEBUG} -O2 ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS}
 AFLAGS=		-x assembler-with-cpp -traditional-cpp -D_LOCORE
-LINKFLAGS=	-z -Ttext F0100000 -e start
+LINKFLAGS=	-z -Ttext E0100000 -e start
 STRIPFLAGS=	-d
 TOUCHFLAGS=	-f -c
 
diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index 8890142ee52..f58b0729070 100644
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.6 1998/05/28 13:30:14 mickey Exp $	*/
+/*	$OpenBSD: param.h,v 1.7 1999/09/17 16:52:05 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.29 1996/03/04 05:04:26 cgd Exp $	*/
 
 /*-
@@ -70,11 +70,8 @@
 #define	PGOFSET		(NBPG-1)	/* byte offset into page */
 #define	NPTEPG		(NBPG/(sizeof (pt_entry_t)))
 
-#define	KERNBASE	0xf0000000	/* start of kernel virtual space */
-#if 0
-#define	KERNSIZE	0x01800000	/* size of kernel virtual space */
-#endif
-#define	KERNTEXTOFF	0xf0100000	/* start of kernel text */
+#define	KERNBASE	0xe0000000		/* start of kernel virtual space */
+#define	KERNTEXTOFF	(KERNBASE+0x100000)	/* start of kernel text */
 #define	BTOPKERNBASE	((u_long)KERNBASE >> PGSHIFT)
 
 #define	DEV_BSHIFT	9		/* log2(DEV_BSIZE) */
diff --git a/sys/arch/i386/include/pmap.h b/sys/arch/i386/include/pmap.h
index 351eb33f0a4..233ab22a5bb 100644
--- a/sys/arch/i386/include/pmap.h
+++ b/sys/arch/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.10 1999/02/26 10:26:58 art Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.11 1999/09/17 16:52:05 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.23 1996/05/03 19:26:30 christos Exp $	*/
 
 /* 
@@ -66,11 +66,11 @@
  * One page directory, shared between
  * kernel and user modes.
  */
-#define	PTDPTDI		0x3bf		/* ptd entry that points to ptd! */
-#define	KPTDI		0x3c0		/* start of kernel virtual pde's */
-#define	NKPDE		63		/* # to static alloc */
-#define	MAXKPDE		(APTDPTDI-KPTDI)
+#define	KPTDI		(KERNBASE>>22)	/* start of kernel virtual pde's */
+#define	PTDPTDI		(KPTDI-1)	/* ptd entry that points to ptd! */
 #define	APTDPTDI	0x3ff		/* start of alternate page directory */
+#define	MAXKPDE		(APTDPTDI-KPTDI)
+#define	NKPDE		127		/* # to static alloc */
 
 /*
  * Address of current and alternate address space page table maps
diff --git a/sys/arch/i386/include/pmap.old.h b/sys/arch/i386/include/pmap.old.h
index b4487b80e25..53440f158e4 100644
--- a/sys/arch/i386/include/pmap.old.h
+++ b/sys/arch/i386/include/pmap.old.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.old.h,v 1.10 1999/02/26 10:26:58 art Exp $	*/
+/*	$OpenBSD: pmap.old.h,v 1.11 1999/09/17 16:52:05 deraadt Exp $	*/
 /*	$NetBSD: pmap.h,v 1.23 1996/05/03 19:26:30 christos Exp $	*/
 
 /* 
@@ -66,11 +66,11 @@
  * One page directory, shared between
  * kernel and user modes.
  */
-#define	PTDPTDI		0x3bf		/* ptd entry that points to ptd! */
-#define	KPTDI		0x3c0		/* start of kernel virtual pde's */
-#define	NKPDE		63		/* # to static alloc */
-#define	MAXKPDE		(APTDPTDI-KPTDI)
+#define	KPTDI		(KERNBASE>>22)	/* start of kernel virtual pde's */
+#define	PTDPTDI		(KPTDI-1)	/* ptd entry that points to ptd! */
 #define	APTDPTDI	0x3ff		/* start of alternate page directory */
+#define	MAXKPDE		(APTDPTDI-KPTDI)
+#define	NKPDE		127		/* # to static alloc */
 
 /*
  * Address of current and alternate address space page table maps
diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h
index 5ead15c680e..8edc46f4a4c 100644
--- a/sys/arch/i386/include/vmparam.h
+++ b/sys/arch/i386/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.11 1999/02/26 04:17:20 art Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.12 1999/09/17 16:52:06 deraadt Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.15 1994/10/27 04:16:34 cgd Exp $	*/
 
 /*-
@@ -132,14 +132,10 @@
 
 /* user/kernel map constants */
 #define VM_MIN_ADDRESS		((vm_offset_t)0)
-/* PTDPTDI<<PDSHIFT - USPACE */
-#define VM_MAXUSER_ADDRESS	((vm_offset_t)0xefbfe000)
-/* PTDPTDI<<PDSHIFT + PTDPTDI<<PGSHIFT */
-#define VM_MAX_ADDRESS		((vm_offset_t)0xeffdf000)
-/* KPTDI<<PDSHIFT */
-#define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)0xf0000000)
-/* APTDPTDI<<PDSHIFT */
-#define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)0xffc00000)
+#define VM_MAXUSER_ADDRESS	((vm_offset_t)((PTDPTDI<<PDSHIFT) - USPACE))
+#define VM_MAX_ADDRESS		((vm_offset_t)((PTDPTDI<<PDSHIFT) + (PTDPTDI<<PGSHIFT)))
+#define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)KERNBASE)
+#define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)(APTDPTDI<<PDSHIFT))
 
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_MBUF_SIZE		(NMBCLUSTERS*MCLBYTES)