X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86_64%2Finclude%2Fmm_virt.h;h=420db1b164ea0127ece7b29d29c443cea97db9da;hb=9f407c493c33928e0f19b834699d9694036ca42e;hp=2dd28dd6b6b48c38ee0112cd1e723c3bda81d84b;hpb=b98fbd4e9c71447d81fc9bd643fb174c76346e0f;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86_64/include/mm_virt.h b/Kernel/arch/x86_64/include/mm_virt.h
index 2dd28dd6..420db1b1 100644
--- a/Kernel/arch/x86_64/include/mm_virt.h
+++ b/Kernel/arch/x86_64/include/mm_virt.h
@@ -9,19 +9,55 @@
 #ifndef _VMEM_H_
 #define _VMEM_H_
 
+#include <arch.h>
+
 // === Memory Location Definitions ===
 /*
  * Userland - Lower Half
  * Kernel land - Upper Half
  * 
- * 0xFFFF8000 00000000 - 0xFFFFFFFF FFFFFFFF	2**47	Kernel Range
- *       8000 00000000 -       8000 7FFFFFFF	2 GiB	Identity Map
- *       8000 80000000 -       8001 00000000	2 GiB	Kernel Heap
- *       9000 00000000 0       9800 00000000	cbf	Module Space
+ *    START ADDRESS          END ADDRESS       BITS   SIZE      NAME
+ * 0xFFFF8000 00000000 - 0xFFFFFFFF FFFFFFFF	47	128 TiB	Kernel Range
+ *       8000 00000000 -       8000 7FFFFFFF	31	2   GiB	Identity Map
+ *       8000 80000000 -       9000 00000000	~44	16  TiB	Kernel Heap
+ *       9000 00000000 -       9800 00000000	43	8   TiB	Module Space
+ *       9800 00000000 -       9900 00000000	40	1   TiB	Per-Process Data
+ *       9900 00000000 -       9A00 00000000	40	1   TiB	Kernel VFS
+ *       A000 00000000 -       B000 00000000	44	16  TiB	Kernel Stacks
+ *       D000 00000000 -       E000 00000000	44	16  TiB	Hardware Mappings
+ *       FE00 00000000 -       FE80 00000000	39	512 GiB	Fractal Mapping
+ *       FE80 00000000 -       FF00 00000000	39	512 GiB	Temp Fractal Mapping
  */
 
-#define	KERNEL_BASE	0xFFF8000##00000000
-#define MM_KHEAP_BASE	(KERNEL_BASE|0x80000000)
-#define MM_KHEAP_MAX	(KERNEL_BASE|0x1##00000000)
+#define	MM_USER_MIN 	0x00000000##00010000
+#define USER_LIB_MAX	0x00008000##00000000
+#define USER_STACK_SZ	0x00000000##00020000	// 64 KiB
+#define USER_STACK_TOP	0x00008FFF##FFFFF000
+#define	MM_USER_MAX 	0x00008FFF##FFFFF000
+//#define	KERNEL_BASE	0xFFF8000##00000000
+#define MM_KHEAP_BASE	(KERNEL_BASE|(0x8000##80000000))
+#define MM_KHEAP_MAX	(KERNEL_BASE|(0x8001##00000000))
+#define MM_MODULE_MIN	(KERNEL_BASE|(0x9000##00000000))
+#define MM_MODULE_MAX	(KERNEL_BASE|(0x9800##00000000))
+#define MM_PPD_BASE 	(KERNEL_BASE|(0x9800##00000000))
+#define MM_PPD_CFG  	MM_PPD_BASE
+#define MM_PPD_VFS  	(KERNEL_BASE|(0x9880##00000000))
+#define MM_KERNEL_VFS	(KERNEL_BASE|(0x9900##00000000))
+#define MM_KSTACK_BASE	(KERNEL_BASE|(0xA000##00000000))
+#define MM_KSTACK_TOP	(KERNEL_BASE|(0xC000##00000000))
+
+#define MM_HWMAP_BASE	(KERNEL_BASE|(0xD000##00000000))
+#define MM_HWMAP_TOP	(KERNEL_BASE|(0xE000##00000000))
+
+#define MM_LOCALAPIC	(KERNEL_BASE|(0xFD00##00000000))
+#define MM_FRACTAL_BASE	(KERNEL_BASE|(0xFE00##00000000))
+#define MM_TMPFRAC_BASE	(KERNEL_BASE|(0xFE80##00000000))
+
+
+// === FUNCTIONS ===
+void	MM_FinishVirtualInit(void);
+tVAddr	MM_NewKStack(void);
+tVAddr	MM_Clone(void);
+tVAddr	MM_NewWorkerStack(void);
 
 #endif