xnu-517.tar.gz

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

diff --git a/osfmk/mach/vm_param.h b/osfmk/mach/vm_param.h
index e4511b2a96f09484a9060003a976d1132c9e009c..82d4764495d4fa3a4233133b858489d41bcddd45 100644 (file)
--- a/osfmk/mach/vm_param.h
+++ b/osfmk/mach/vm_param.h
@@ -83,7 +83,9 @@
 
 #include <mach/machine/vm_param.h>
 
+#ifndef        ASSEMBLER
 #include <mach/vm_types.h>
+#endif /* ASSEMBLER */
 
 /*
  *     The machine independent pages are refered to as PAGES.  A page
@@ -102,11 +104,19 @@
  *     virtual memory system implementation.
  */
 
-#ifndef        PAGE_SIZE_FIXED
+#ifdef PAGE_SIZE_FIXED
+#define PAGE_SIZE      4096
+#define PAGE_SHIFT     12
+#define        PAGE_MASK       (PAGE_SIZE-1)
+#endif /* PAGE_SIZE_FIXED */
+
+#ifndef        ASSEMBLER
+
 extern vm_size_t       page_size;
 extern vm_size_t       page_mask;
 extern int             page_shift;
 
+#ifndef        PAGE_SIZE_FIXED
 #define PAGE_SIZE      page_size       /* pagesize in addr units */
 #define PAGE_SHIFT     page_shift      /* number of bits to shift for pages */
 #define PAGE_MASK      page_mask       /* mask for off in page */
@@ -114,15 +124,11 @@ extern int                page_shift;
 #define PAGE_SIZE_64 (unsigned long long)page_size /* pagesize in addr units */
 #define PAGE_MASK_64 (unsigned long long)page_mask /* mask for off in page */
 #else  /* PAGE_SIZE_FIXED */
-#define PAGE_SIZE      4096
-#define PAGE_SHIFT     12
-#define        PAGE_MASK       (PAGE_SIZE-1)
+
 #define PAGE_SIZE_64   (unsigned long long)4096
 #define PAGE_MASK_64   (PAGE_SIZE_64-1)
 #endif /* PAGE_SIZE_FIXED */
 
-#ifndef        ASSEMBLER
-
 /*
  *     Convert addresses to pages and vice versa.  No rounding is used.
  *      The atop_32 and ptoa_32 macros should not be use on 64 bit types.
@@ -243,8 +249,24 @@ extern int         page_shift;
 
 #define        page_aligned(x) ((((vm_object_offset_t) (x)) & PAGE_MASK) == 0)
 
-extern vm_size_t       mem_size;       /* size of physical memory (bytes) */
+extern vm_size_t       mem_size;               /* 32-bit size of memory - limited by maxmem - deprecated */
 extern uint64_t        max_mem;                        /* 64-bit size of memory - limited by maxmem */
+extern uint64_t        mem_actual;                     /* 64-bit size of memory - not limited by maxmem */
+extern uint64_t        sane_size;                      /* Memory size to use for defaults calculations */
+extern addr64_t        vm_last_addr;   /* Highest kernel virtual address known to the VM system */
+
+/* We need a way to get rid of compiler warnings when we cast from   */
+/* a 64 bit value to an address that is 32 bits.                     */
+/* We know at this point the cast is harmless but sometime in        */
+/* the future it may not be.                                         */
+/* When size of an int is no longer equal to size of uintptr_t then  */
+/* the compile will fail and we know we need to fix our cast.           */
+#include <stdint.h>
+#ifndef __CAST_DOWN_CHECK
+#define __CAST_DOWN_CHECK
+typedef char __NEED_TO_CHANGE_CAST_DOWN[ sizeof(uintptr_t) == sizeof(int) ? 0 : -1 ];
+#define CAST_DOWN( type, addr )  ( ((type)((uintptr_t) (addr))) ) 
+#endif /* __CAST_DOWN_CHECK */
 
 #endif /* ASSEMBLER */
 #endif /* _MACH_VM_PARAM_H_ */