[ros-diffs] [tkreuzer] 67467: [FREELDR] Hey Arch, hyperspace is not the page table range! Rename HYPER_SPACE_ENTRY to SELFMAP_ENTRY.

Author: tkreuzer
Date: Tue Apr 28 21:25:43 2015
New Revision: 67467

URL: http://svn.reactos.org/svn/reactos?rev=67467&view=rev
Log:
[FREELDR]
Hey Arch, hyperspace is not the page table range!
Rename HYPER_SPACE_ENTRY to SELFMAP_ENTRY.

Modified:
    trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c
    trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c

Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/winldr.c	[iso-8859-1] Tue Apr 28
21:25:43 2015
@@ -14,8 +14,6 @@
 #include <debug.h>
 
 //extern ULONG LoaderPagesSpanned;
-
-#define HYPER_SPACE_ENTRY       0x1EE
 
 DBG_DEFAULT_CHANNEL(WINDOWS);
 

Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/arch/i386/winldr.c	[iso-8859-1] Tue Apr 28 21:25:43
2015
@@ -17,7 +17,7 @@
 #undef KIP0PCRADDRESS
 #define KIP0PCRADDRESS                      0xffdff000
 
-#define HYPER_SPACE_ENTRY       0x300
+#define SELFMAP_ENTRY       0x300
 
 // This is needed only for SetProcessorContext routine
 #pragma pack(2)
@@ -93,9 +93,9 @@
     PDE = (PHARDWARE_PTE)Buffer;
 
     // Map the page directory at 0xC0000000 (maps itself)
-    PDE[HYPER_SPACE_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT;
-    PDE[HYPER_SPACE_ENTRY].Valid = 1;
-    PDE[HYPER_SPACE_ENTRY].Write = 1;
+    PDE[SELFMAP_ENTRY].PageFrameNumber = (ULONG)PDE >> MM_PAGE_SHIFT;
+    PDE[SELFMAP_ENTRY].Valid = 1;
+    PDE[SELFMAP_ENTRY].Write = 1;
 
     // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses
0xFFC00000 - 0xFFFFFFFF)
     HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1];
@@ -204,8 +204,8 @@
     PHARDWARE_PTE KernelPT;
     PFN_NUMBER Entry = (Page >> 10) + (KSEG0_BASE >> 22);
 
-    /* Don't unmap hyperspace or HAL entries */
-    if (Entry == HYPER_SPACE_ENTRY || Entry == 1023)
+    /* Don't unmap page directory or HAL entries */
+    if (Entry == SELFMAP_ENTRY || Entry == 1023)
         return;
 
     if (PDE[Entry].Valid)