working version recursive map.

SCCS-vsn: sys/i386/include/vmparam.h 5.7

diff --git a/usr/src/sys/i386/include/vmparam.h b/usr/src/sys/i386/include/vmparam.h
index d4dd031..f98d4cf 100644 (file)
--- a/usr/src/sys/i386/include/vmparam.h
+++ b/usr/src/sys/i386/include/vmparam.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vmparam.h   5.6 (Berkeley) %G%
+ *     @(#)vmparam.h   5.7 (Berkeley) %G%

  */
 
 
  */
 
 


@@ -27,10 +27,10 @@
  * Immediately after the user structure is the kernal address space.
  */
 #define        USRTEXT         0
  * Immediately after the user structure is the kernal address space.
  */
 #define        USRTEXT         0

-#define        USRSTACK        0xFDFFE000      /* Sysbase - UPAGES*NBPG */
-#define        BTOPUSRSTACK    (0xFE000-(UPAGES))      /* btop(USRSTACK) */
+#define        USRSTACK        0xFDBFE000
+#define        BTOPUSRSTACK    (0xFDC00-(UPAGES))      /* btop(USRSTACK) */

 
 

-#define P1PAGES                0xFE000
+#define P1PAGES                0xFDC00

 #define        LOWPAGES        0
 #define HIGHPAGES      UPAGES
 
 #define        LOWPAGES        0
 #define HIGHPAGES      UPAGES
 


@@ -176,9 +176,14 @@
 
 /* user/kernel map constants */
 #define VM_MIN_ADDRESS         ((vm_offset_t)0)
 
 /* user/kernel map constants */
 #define VM_MIN_ADDRESS         ((vm_offset_t)0)

-#define VM_MAX_ADDRESS         ((vm_offset_t)0xFFFFF000)
-#define VM_MIN_KERNEL_ADDRESS  ((vm_offset_t)0xFE000000)
-#define VM_MAX_KERNEL_ADDRESS  ((vm_offset_t)0xFFFFF000)
+#define UPT_MIN_ADDRESS                ((vm_offset_t)0xFDC00000)
+#define UPT_MAX_ADDRESS                ((vm_offset_t)0xFDFF7000)
+#define VM_MAX_ADDRESS         UPT_MAX_ADDRESS
+#define VM_MIN_KERNEL_ADDRESS  ((vm_offset_t)0xFDFF7000)
+#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)

 
 /* 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)


@@ -199,6 +204,7 @@
 #define        I386_CR3PAT     0x0
 #endif
 
 #define        I386_CR3PAT     0x0
 #endif
 

+#ifdef notyet

 #define _cr3() ({u_long rtn; \
        asm (" movl %%cr3,%%eax; movl %%eax,%0 " \
                : "=g" (rtn) \
 #define _cr3() ({u_long rtn; \
        asm (" movl %%cr3,%%eax; movl %%eax,%0 " \
                : "=g" (rtn) \


@@ -222,3 +228,4 @@
                : "g" (val) \
                : "ax"); \
 })
                : "g" (val) \
                : "ax"); \
 })

+#endif