Fixes to 64-bit port, now working on physical memory allocation

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

diff --git a/Kernel/arch/x86_64/include/mm_virt.h b/Kernel/arch/x86_64/include/mm_virt.h
index 502be55..206dcd9 100644 (file)
--- a/Kernel/arch/x86_64/include/mm_virt.h
+++ b/Kernel/arch/x86_64/include/mm_virt.h
@@ -25,9 +25,11 @@
  *       9000 00000000 -       9800 00000000   43      8   TiB Module Space
  *       9800 00000000 -       9A00 00000000   41      2   TiB Kernel VFS
  *       A000 00000000 -       B000 00000000   44      16  TiB Kernel Stacks
- *       D000 00000000 -       E000 00000000   44      16  TiB Hardware Mappings
- *       E000 00000000 -       E080 00000000   39      512     GiB     Per-Process Data
- *       E080 00000000 -       E100 00000000   39      512     GiB     Kernel Supplied User Code
+ *       C000 00000000 -       D000 00000000   44      16  TiB Hardware Mappings
+ *       D000 00000000 -       D080 00000000   39      512     GiB     Per-Process Data
+ *       D080 00000000 -       D100 00000000   39      512     GiB     Kernel Supplied User Code
+ *       E000 00000000 -       E400 00000000   42      4       TiB     Physical Page Reference Counts (2**40 = 2**52 bytes)
+ *       FD00 00000000 -       FD80 00000000   39      512 GiB Local APIC
  *       FE00 00000000 -       FE80 00000000   39      512 GiB Fractal Mapping (PML4 510)
  *       FE80 00000000 -       FF00 00000000   39      512 GiB Temp Fractal Mapping
  */
@@ -39,19 +41,20 @@
 #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_KHEAP_MAX   (KERNEL_BASE|(0x9000##00000000))
 #define MM_MODULE_MIN  (KERNEL_BASE|(0x9000##00000000))
 #define MM_MODULE_MAX  (KERNEL_BASE|(0x9800##00000000))
 #define MM_KERNEL_VFS  (KERNEL_BASE|(0x9800##00000000))
 #define MM_KSTACK_BASE (KERNEL_BASE|(0xA000##00000000))
-#define MM_KSTACK_TOP  (KERNEL_BASE|(0xC000##00000000))
+#define MM_KSTACK_TOP  (KERNEL_BASE|(0xB000##00000000))
 
-#define MM_HWMAP_BASE  (KERNEL_BASE|(0xD000##00000000))
-#define MM_HWMAP_TOP   (KERNEL_BASE|(0xE000##00000000))
-#define MM_PPD_BASE    (KERNEL_BASE|(0xE000##00000000))
+#define MM_HWMAP_BASE  (KERNEL_BASE|(0xC000##00000000))
+#define MM_HWMAP_TOP   (KERNEL_BASE|(0xD000##00000000))
+#define MM_PPD_BASE    (KERNEL_BASE|(0xD000##00000000))
 #define MM_PPD_CFG     MM_PPD_BASE
-#define MM_PPD_VFS     (KERNEL_BASE|(0xE008##00000000))
-#define MM_USER_CODE   (KERNEL_BASE|(0xE080##00000000))
+#define MM_PPD_VFS     (KERNEL_BASE|(0xD008##00000000))
+#define MM_USER_CODE   (KERNEL_BASE|(0xD080##00000000))
+#define MM_PAGE_COUNTS (KERNEL_BASE|(0xE000##00000000))
 
 #define MM_LOCALAPIC   (KERNEL_BASE|(0xFD00##00000000))
 #define MM_FRACTAL_BASE        (KERNEL_BASE|(0xFE00##00000000))