Misc fiddling to ARMv7 for trimslice builds

[tpg/acess2.git] / Kernel / arch / armv7 / include / mm_virt.h

diff --git a/Kernel/arch/armv7/include/mm_virt.h b/Kernel/arch/armv7/include/mm_virt.h
index b57e45c..c1f10de 100644 (file)
--- a/Kernel/arch/armv7/include/mm_virt.h
+++ b/Kernel/arch/armv7/include/mm_virt.h
@@ -5,11 +5,19 @@
 #ifndef _MM_VIRT_H_
 #define _MM_VIRT_H_
 
+#include "options.h"
+
+#define USER_STACK_COMM    0x04000     // Pages to allocate up front
+#define USER_STACK_SIZE           0x10000      // Stack space
+#define USER_STACK_TOP 0x78000000
+
 #define MM_USER_MIN    0x00001000
-#define USER_LIB_MAX   0x7F800000
+#define USER_LIB_MAX   0x70000000
 #define MM_PPD_HANDLES 0x7F800000
-#define MM_TABLE0USER  0x7F900000      // 2 GiB - 16 KiB
 #define MM_TABLE1USER  0x7FC00000      // 2 GiB - 4 MiB
+#define MM_TABLE0USER  0x7FE00000      // 2 GiB - 2 MiB
+#define MM_KSTACK_BASE 0x7FE00000
+#define MM_KSTACK_END  0x80000000
 
 // Page Blocks are 12-bits wide (12 address bits used)
 // Hence, the table is 16KiB large (and must be so aligned)
@@ -24,7 +32,10 @@
 #define MM_KHEAP_MAX   0xC0000000      // ~1GiB of kernel heap
 
 #define MM_MODULE_MIN  0xC0000000      // - 0xD0000000
-#define MM_MODULE_MAX  0xD0000000
+#define MM_MODULE_MAX  0xCF000000
+
+#define MM_GLOBALSTACKS        0xCF000000      // Global stacks
+#define MM_GLOBALSTACKS_END    0xD0000000
 
 // PMM Data, giving it 256MiB is overkill, but it's unused atm
 #define MM_MAXPHYSPAGE (1024*1024)
@@ -41,6 +52,6 @@
 
 #define MM_KERNEL_VFS  0xFF000000      // 
 #define MM_TABLE1KERN  0xFF800000      // - 0x???????? 4MiB
-#define MM_TABLE0KERN  0xFFC00000      // - 0xFFE04000 16KiB
+//#define MM_TABLE0KERN        0xFFC00000      // - 0xFFE04000 16KiB
 
 #endif