This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.1'.

[unix-history] / sys / i386 / include / vmparam.h

diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 88c0887..df90126 100644 (file)
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -1,6 +1,8 @@
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.

+ * Copyright (c) 1994 John S. Dyson
+ * All rights reserved.

  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.
  *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz.


@@ -33,10 +35,14 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *

- *     @(#)vmparam.h   5.9 (Berkeley) 5/12/91
+ *     from: @(#)vmparam.h     5.9 (Berkeley) 5/12/91
+ *     $Id: vmparam.h,v 1.11 1994/01/14 16:24:00 davidg Exp $

  */
 
 
  */
 
 

+#ifndef _MACHINE_VMPARAM_H_
+#define _MACHINE_VMPARAM_H_ 1
+

 /*
  * Machine dependent constants for 386.
  */
 /*
  * Machine dependent constants for 386.
  */


@@ -52,27 +58,30 @@
  * Immediately after the user structure is the page table map, and then
  * kernal address space.
  */
  * Immediately after the user structure is the page table map, and then
  * kernal address space.
  */

-#define        USRTEXT         0
-#define        USRSTACK        0xFDBFE000
+#define        USRTEXT         0UL
+/* #define     USRSTACK        0xFDBFE000UL */

 #define        BTOPUSRSTACK    (0xFDC00-(UPAGES))      /* btop(USRSTACK) */
 #define        BTOPUSRSTACK    (0xFDC00-(UPAGES))      /* btop(USRSTACK) */

-#define        LOWPAGES        0
+#define        LOWPAGES        0UL

 #define HIGHPAGES      UPAGES
 
 /*
  * Virtual memory related constants, all in bytes
  */
 #define HIGHPAGES      UPAGES
 
 /*
  * Virtual memory related constants, all in bytes
  */

-#define        MAXTSIZ         (6*1024*1024)           /* max text size */
+#define        MAXTSIZ         (16UL*1024*1024)        /* max text size */

 #ifndef DFLDSIZ
 #ifndef DFLDSIZ

-#define        DFLDSIZ         (16*1024*1024)          /* initial data size limit */
+#define        DFLDSIZ         (64UL*1024*1024)        /* initial data size limit */

 #endif
 #ifndef MAXDSIZ
 #endif
 #ifndef MAXDSIZ

-#define        MAXDSIZ         (32*1024*1024)          /* max data size */
+#define        MAXDSIZ         (128UL*1024*1024)       /* max data size */

 #endif
 #ifndef        DFLSSIZ
 #endif
 #ifndef        DFLSSIZ

-#define        DFLSSIZ         (512*1024)              /* initial stack size limit */
+#define        DFLSSIZ         (8UL*1024*1024)         /* initial stack size limit */

 #endif
 #ifndef        MAXSSIZ
 #endif
 #ifndef        MAXSSIZ

-#define        MAXSSIZ         MAXDSIZ                 /* max stack size */
+#define        MAXSSIZ         (64UL*1024*1024)        /* max stack size */
+#endif
+#ifndef SGROWSIZ
+#define SGROWSIZ       (128UL*1024)            /* amount to grow stack */

 #endif
 
 /*
 #endif
 
 /*


@@ -90,10 +99,17 @@
 #define        SYSPTSIZE       (2*NPTEPG)
 #define        USRPTSIZE       (2*NPTEPG)
 
 #define        SYSPTSIZE       (2*NPTEPG)
 #define        USRPTSIZE       (2*NPTEPG)
 

+/*
+ * Size of the Shared Memory Pages page table.
+ */
+#ifndef        SHMMAXPGS
+#define        SHMMAXPGS       512             /* XXX until we have more kmap space */
+#endif
+

 /*
  * Size of User Raw I/O map
  */
 /*
  * Size of User Raw I/O map
  */

-#define        USRIOSIZE       300
+#define        USRIOSIZE       1024

 
 /*
  * The size of the clock loop.
 
 /*
  * The size of the clock loop.


@@ -199,25 +215,29 @@
  */
 
 /* user/kernel map constants */
  */
 
 /* user/kernel map constants */

+#define        KERNBASE (0-(NKPDE+1)*(NBPG*NPTEPG))
+#define KERNSIZE (NKPDE*NBPG*NPTEPG)
+

 #define VM_MIN_ADDRESS         ((vm_offset_t)0)
 #define VM_MIN_ADDRESS         ((vm_offset_t)0)

-#define VM_MAXUSER_ADDRESS     ((vm_offset_t)0xFDBFE000)
-#define UPT_MIN_ADDRESS                ((vm_offset_t)0xFDC00000)
-#define UPT_MAX_ADDRESS                ((vm_offset_t)0xFDFF7000)
+#define VM_MAXUSER_ADDRESS     ((vm_offset_t)KERNBASE - (NBPG*(NPTEPG+UPAGES)))
+#define USRSTACK VM_MAXUSER_ADDRESS
+#define UPT_MIN_ADDRESS                ((vm_offset_t)KERNBASE - (NBPG*NPTEPG))
+#define UPT_MAX_ADDRESS                ((vm_offset_t)KERNBASE - (NBPG*(NKPDE+2)))

 #define VM_MAX_ADDRESS         UPT_MAX_ADDRESS
 #define VM_MAX_ADDRESS         UPT_MAX_ADDRESS

-#define VM_MIN_KERNEL_ADDRESS  ((vm_offset_t)0xFDFF7000)
+#define VM_MIN_KERNEL_ADDRESS  ((vm_offset_t)KERNBASE - (NBPG*(NKPDE+2)))

 #define UPDT                   VM_MIN_KERNEL_ADDRESS
 #define UPDT                   VM_MIN_KERNEL_ADDRESS

-#define KPT_MIN_ADDRESS                ((vm_offset_t)0xFDFF8000)
-#define KPT_MAX_ADDRESS                ((vm_offset_t)0xFDFFF000)
-#define VM_MAX_KERNEL_ADDRESS  ((vm_offset_t)0xFF7FF000)
+#define KPT_MIN_ADDRESS                ((vm_offset_t)(KERNBASE) - (NBPG*(NKPDE+1)))
+#define KPT_MAX_ADDRESS                ((vm_offset_t)(KERNBASE) - NBPG)
+#define VM_MAX_KERNEL_ADDRESS  ((vm_offset_t)ALT_MIN_ADDRESS - NBPG)
+#define ALT_MIN_ADDRESS                ((vm_offset_t)((APTDPTDI) << 22))
+#define HIGHPAGES UPAGES
+

 
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_MBUF_SIZE           (NMBCLUSTERS*MCLBYTES)
 
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_MBUF_SIZE           (NMBCLUSTERS*MCLBYTES)

-#define VM_KMEM_SIZE           (NKMEMCLUSTERS*CLBYTES)
+#define VM_KMEM_SIZE           (16 * 1024 * 1024)

 #define VM_PHYS_SIZE           (USRIOSIZE*CLBYTES)
 
 #define VM_PHYS_SIZE           (USRIOSIZE*CLBYTES)
 

-/* # of kernel PT pages (initial only, can grow dynamically) */
-#define VM_KERNEL_PT_PAGES     ((vm_size_t)2)          /* XXX: SYSPTSIZE */
-

 /* pcb base */
 #define        pcbb(p)         ((u_int)(p)->p_addr)
 
 /* pcb base */
 #define        pcbb(p)         ((u_int)(p)->p_addr)
 


@@ -254,3 +274,4 @@
                : "ax"); \
 })
 #endif
                : "ax"); \
 })
 #endif

+#endif /* _MACHINE_VMPARAM_H_ */