xnu-4570.41.2.tar.gz

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

diff --git a/osfmk/mach/shared_region.h b/osfmk/mach/shared_region.h
index 2297ba7b7b9bbfb9736e1c21420985b3ae0f0f6b..19351b07f302fbe54b58570ff060b4b2450e10b2 100644 (file)
--- a/osfmk/mach/shared_region.h
+++ b/osfmk/mach/shared_region.h
@@ -42,10 +42,10 @@
 #define SHARED_REGION_NESTING_MIN_I386         0x00200000ULL
 #define SHARED_REGION_NESTING_MAX_I386         0xFFE00000ULL
 
 #define SHARED_REGION_NESTING_MIN_I386         0x00200000ULL
 #define SHARED_REGION_NESTING_MAX_I386         0xFFE00000ULL
 

-#define SHARED_REGION_BASE_X86_64              0x00007FFF70000000ULL
-#define SHARED_REGION_SIZE_X86_64              0x000000008FE00000ULL
-#define SHARED_REGION_NESTING_BASE_X86_64      0x00007FFF80000000ULL
-#define SHARED_REGION_NESTING_SIZE_X86_64      0x0000000040000000ULL
+#define SHARED_REGION_BASE_X86_64              0x00007FFF00000000ULL
+#define SHARED_REGION_SIZE_X86_64              0x00000000FFE00000ULL
+#define SHARED_REGION_NESTING_BASE_X86_64      0x00007FFF00000000ULL
+#define SHARED_REGION_NESTING_SIZE_X86_64      0x00000000FFE00000ULL

 #define SHARED_REGION_NESTING_MIN_X86_64       0x0000000000200000ULL
 #define SHARED_REGION_NESTING_MAX_X86_64       0xFFFFFFFFFFE00000ULL
 
 #define SHARED_REGION_NESTING_MIN_X86_64       0x0000000000200000ULL
 #define SHARED_REGION_NESTING_MAX_X86_64       0xFFFFFFFFFFE00000ULL
 


@@ -63,13 +63,22 @@
 #define SHARED_REGION_NESTING_MIN_PPC64                0x0000000010000000ULL
 #define SHARED_REGION_NESTING_MAX_PPC64                0x0000000010000000ULL
 
 #define SHARED_REGION_NESTING_MIN_PPC64                0x0000000010000000ULL
 #define SHARED_REGION_NESTING_MAX_PPC64                0x0000000010000000ULL
 

-#define SHARED_REGION_BASE_ARM                 0x30000000ULL
-#define SHARED_REGION_SIZE_ARM                 0x10000000ULL
-#define SHARED_REGION_NESTING_BASE_ARM         0x30000000ULL
-#define SHARED_REGION_NESTING_SIZE_ARM         0x10000000ULL
+#define SHARED_REGION_BASE_ARM                 0x1A000000ULL
+#define SHARED_REGION_SIZE_ARM                 0x26000000ULL
+#define SHARED_REGION_NESTING_BASE_ARM         0x1A000000ULL
+#define SHARED_REGION_NESTING_SIZE_ARM         0x26000000ULL

 #define SHARED_REGION_NESTING_MIN_ARM          ?
 #define SHARED_REGION_NESTING_MAX_ARM          ?
 
 #define SHARED_REGION_NESTING_MIN_ARM          ?
 #define SHARED_REGION_NESTING_MAX_ARM          ?
 

+#ifdef XNU_KERNEL_PRIVATE
+/* ARM64_TODO: move to higher memory */
+#endif
+#define SHARED_REGION_BASE_ARM64               0x180000000ULL
+#define SHARED_REGION_SIZE_ARM64               0x40000000ULL
+#define SHARED_REGION_NESTING_BASE_ARM64       0x180000000ULL
+#define SHARED_REGION_NESTING_SIZE_ARM64       0x40000000ULL
+#define SHARED_REGION_NESTING_MIN_ARM64                ?
+#define SHARED_REGION_NESTING_MAX_ARM64                ?

 
 #if defined(__i386__)
 #define SHARED_REGION_BASE                     SHARED_REGION_BASE_I386
 
 #if defined(__i386__)
 #define SHARED_REGION_BASE                     SHARED_REGION_BASE_I386


@@ -85,6 +94,20 @@
 #define SHARED_REGION_NESTING_SIZE             SHARED_REGION_NESTING_SIZE_X86_64
 #define SHARED_REGION_NESTING_MIN              SHARED_REGION_NESTING_MIN_X86_64
 #define SHARED_REGION_NESTING_MAX              SHARED_REGION_NESTING_MAX_X86_64
 #define SHARED_REGION_NESTING_SIZE             SHARED_REGION_NESTING_SIZE_X86_64
 #define SHARED_REGION_NESTING_MIN              SHARED_REGION_NESTING_MIN_X86_64
 #define SHARED_REGION_NESTING_MAX              SHARED_REGION_NESTING_MAX_X86_64

+#elif defined(__arm__)
+#define SHARED_REGION_BASE                     SHARED_REGION_BASE_ARM
+#define SHARED_REGION_SIZE                     SHARED_REGION_SIZE_ARM
+#define SHARED_REGION_NESTING_BASE             SHARED_REGION_NESTING_BASE_ARM
+#define SHARED_REGION_NESTING_SIZE             SHARED_REGION_NESTING_SIZE_ARM
+#define SHARED_REGION_NESTING_MIN              SHARED_REGION_NESTING_MIN_ARM
+#define SHARED_REGION_NESTING_MAX              SHARED_REGION_NESTING_MAX_ARM
+#elif defined(__arm64__)
+#define SHARED_REGION_BASE                     SHARED_REGION_BASE_ARM64
+#define SHARED_REGION_SIZE                     SHARED_REGION_SIZE_ARM64
+#define SHARED_REGION_NESTING_BASE             SHARED_REGION_NESTING_BASE_ARM64
+#define SHARED_REGION_NESTING_SIZE             SHARED_REGION_NESTING_SIZE_ARM64
+#define SHARED_REGION_NESTING_MIN              SHARED_REGION_NESTING_MIN_ARM64
+#define SHARED_REGION_NESTING_MAX              SHARED_REGION_NESTING_MAX_ARM64

 #endif
 
 #ifdef KERNEL_PRIVATE
 #endif
 
 #ifdef KERNEL_PRIVATE