Kernel - General fixing after ARM7 changes

[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 f1e0794..1a7484c 100644 (file)
--- a/Kernel/arch/x86_64/include/mm_virt.h
+++ b/Kernel/arch/x86_64/include/mm_virt.h
@@ -11,6 +11,8 @@
 
 #include <arch.h>
 
+#define PAGE_SIZE      0x1000
+
 // === Memory Location Definitions ===
 /*
  * Userland - Lower Half
@@ -28,7 +30,7 @@
  *       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
- *       ---- GAP ----                                 9       TiB
+ *       ---- GAP ----                                 15      TiB
  *       E000 00000000 -       E400 00000000   42      4       TiB     Physical Page Reference Counts (2**40 = 2**52 bytes)
  *       E400 00000000 -       E480 00000000   39      512     GiB     Physical Page Bitmap (1 page per bit)
  *       E480 00000000 -       E500 00000000   39      512     GiB     Physical Page DblAlloc Bitmap (1 page per bit)
@@ -36,11 +38,11 @@
  *       ---- GAP ----                                 9       TiB
  *       FE00 00000000 -       FE80 00000000   39      512     GiB     Fractal Mapping (PML4 508)
  *       FE80 00000000 -       FF00 00000000   39      512     GiB     Temp Fractal Mapping
- *       ---- GAP ----                                 512     GiB     -- UNUSED --
- *       FF80 00000000 -       FF80 80000000   39      2       GiB     Local APIC
- *       ---- GAP ----
+ *       FF00 00000000 -       FF80 00000000   39      512     GiB     Temporary page mappings
+ *       FF80 00000000 -       FF80 80000000   31      2       GiB     Local APIC
+ *       ---- GAP ----                                 506     GiB
  *       FFFF 00000000 -       FFFF 80000000   31      2       GiB     User Code
- *       FFFF 80000000 -       FFFF FFFFFFFF   31      2       GiB     Identity Map
+ *       FFFF 80000000 -       FFFF FFFFFFFF   31      2       GiB     Kernel code / data
  */
 
 #define        MM_USER_MIN     0x00000000##00010000
@@ -61,7 +63,7 @@
 #define MM_HWMAP_TOP   (MM_KERNEL_RANGE|(0xD000##00000000))
 #define MM_PPD_BASE    (MM_KERNEL_RANGE|(0xD000##00000000))
 #define MM_PPD_CFG     MM_PPD_BASE
-#define MM_PPD_VFS     (MM_KERNEL_RANGE|(0xD008##00000000))
+#define MM_PPD_HANDLES         (MM_KERNEL_RANGE|(0xD008##00000000))
 #define MM_USER_CODE   (MM_KERNEL_RANGE|(0xD080##00000000))
 
 #define MM_PAGE_COUNTS (MM_KERNEL_RANGE|(0xE000##00000000))
@@ -71,7 +73,10 @@
 
 #define MM_FRACTAL_BASE        (MM_KERNEL_RANGE|(0xFE00##00000000))
 #define MM_TMPFRAC_BASE        (MM_KERNEL_RANGE|(0xFE80##00000000))
+#define MM_TMPMAP_BASE (MM_KERNEL_RANGE|(0xFF00##00000000))
+#define MM_TMPMAP_END  (MM_KERNEL_RANGE|(0xFF80##00000000))
 #define MM_LOCALAPIC   (MM_KERNEL_RANGE|(0xFF80##00000000))
+#define MM_KERNEL_CODE (MM_KERNEL_RANGE|(0xFFFF##80000000))
 
 
 // === FUNCTIONS ===