xnu-517.tar.gz

[apple/xnu.git] / osfmk / mach / i386 / vm_param.h

diff --git a/osfmk/mach/i386/vm_param.h b/osfmk/mach/i386/vm_param.h
index 0f18100e6710a7e776f4e0134dbbf01298ab311e..84f4a3063424a4b93726fc9d2329e7fda5a17227 100644 (file)
--- a/osfmk/mach/i386/vm_param.h
+++ b/osfmk/mach/i386/vm_param.h
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -108,8 +111,10 @@
                                        ~(I386_PGBYTES-1))
 #define i386_trunc_page(x)     (((unsigned)(x)) & ~(I386_PGBYTES-1))
 
                                        ~(I386_PGBYTES-1))
 #define i386_trunc_page(x)     (((unsigned)(x)) & ~(I386_PGBYTES-1))
 

+#define VM_MAX_PAGE_ADDRESS     0x00000000C0000000ULL
+

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

-#define VM_MAX_ADDRESS         ((vm_offset_t) 0xc0000000U)
+#define VM_MAX_ADDRESS         ((vm_offset_t) (VM_MAX_PAGE_ADDRESS & 0xFFFFFFFF))

 
 #define LINEAR_KERNEL_ADDRESS  ((vm_offset_t) 0xc0000000)
 
 
 #define LINEAR_KERNEL_ADDRESS  ((vm_offset_t) 0xc0000000)
 


@@ -123,30 +128,6 @@
 #define        INTSTACK_SIZE   (I386_PGBYTES*4)
 #define        KERNEL_STACK_SIZE       (I386_PGBYTES*4)
 
 #define        INTSTACK_SIZE   (I386_PGBYTES*4)
 #define        KERNEL_STACK_SIZE       (I386_PGBYTES*4)
 

-#if 0          /* FIXME */
-
-#include <norma_vm.h>
-#include <task_swapper.h>
-#include <thread_swapper.h>
-
-#if defined(AT386)
-#include <i386/cpuid.h>
-#endif
-
-#if !NORMA_VM 
-#if !TASK_SWAPPER && !THREAD_SWAPPER
-#define KERNEL_STACK_SIZE      (I386_PGBYTES/2)
-#else
-/* stack needs to be a multiple of page size to get unwired  when swapped */
-#define KERNEL_STACK_SIZE      (I386_PGBYTES)
-#endif /* TASK || THREAD SWAPPER */
-#define INTSTACK_SIZE          (I386_PGBYTES)  /* interrupt stack size */
-#else  /* NORMA_VM */
-#define KERNEL_STACK_SIZE      (I386_PGBYTES*2)
-#define INTSTACK_SIZE          (I386_PGBYTES*2)        /* interrupt stack size */
-#endif /* NORMA_VM */
-#endif /* MACH_KERNEL */
-

 /*
  *     Conversion between 80386 pages and VM pages
  */
 /*
  *     Conversion between 80386 pages and VM pages
  */


@@ -199,7 +180,7 @@
        pmap_enter(                                     \
                (pmap),                                 \
                (virtual_address),                      \
        pmap_enter(                                     \
                (pmap),                                 \
                (virtual_address),                      \

-               (page)->phys_addr,                      \
+               (page)->phys_page,                      \

                __prot__,                               \
                flags,                                  \
                (wired)                                 \
                __prot__,                               \
                flags,                                  \
                (wired)                                 \