[ros-diffs] [tkreuzer] 35360: - comment out ext2.sys in textsetup.sif, as it doesn't load - fix stupid error when creating page directory - fix PtrToPfn() based on updated mm types - some enhancements

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Fri Aug 15 19:16:54 2008
New Revision: 35360

URL: http://svn.reactos.org/svn/reactos?rev=35360&view=rev
Log:
- comment out ext2.sys in textsetup.sif, as it doesn't load
- fix stupid error when creating page directory
- fix PtrToPfn() based on updated mm types
- some enhancements

Modified:
    branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif
    branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
    branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h

Modified: branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif?rev=35360&r1=35359&r2=35360&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Aug 15 19:16:54 2008
@@ -33,7 +33,7 @@
 scsiport.sys=,,,,,,x,,,,,,4
 uniata.sys=,,,,,,,,,,,,4
 fastfat.sys=,,,,,,x,,,,,,4
-ext2.sys=,,,,,,x,,,,,,4
+;ext2.sys=,,,,,,x,,,,,,4
 
 [HardwareIdsDatabase]
 *PNP0C08 = acpi

Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c?rev=35360&r1=35359&r2=35360&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c [iso-8859-1] Fri Aug 15 19:16:54 2008
@@ -117,7 +117,7 @@
 		if (!pSubDir)
 			return NULL;
 		RtlZeroMemory(pSubDir, PAGE_SIZE);
-		pDir->Pde[Index].PageFrameNumber = (ULONGLONG)pSubDir / PAGE_SIZE;
+		pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir);
 		pDir->Pde[Index].Valid = 1;
 		pDir->Pde[Index].Write = 1;
 	}
@@ -196,7 +196,7 @@
 	ULONG KernelPages;
 
 	/* Allocate a Page for the PML4 */
-	pPML4 = MmAllocateMemoryWithType(4096, LoaderSpecialMemory);
+	pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
 
 	ASSERT(pPML4);
 
@@ -205,7 +205,7 @@
 	 * virtual address 0xfffff6fb7dbedf68 */
 	pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1;
 	pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1;
-	pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(PXE_BASE);
+	pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4);
 
 	/* Setup low memory pages */
 	if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024)

Modified: branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h?rev=35360&r1=35359&r2=35360&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/include/arch/amd64/amd64.h [iso-8859-1] Fri Aug 15 19:16:54 2008
@@ -30,7 +30,7 @@
 #define VA_MASK 0x0000FFFFFFFFFFFFUL
 
 #define PtrToPfn(p) \
-    ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xffffffffffULL)
+    ((((ULONGLONG)p) >> PAGE_SHIFT) & 0xfffffffULL)
 
 #define VAtoPXI(va) (((va) >> PXI_SHIFT) & 0x1FF)
 #define VAtoPPI(va) (((va) >> PPI_SHIFT) & 0x1FF)