[ros-diffs] [tkreuzer] 45191: [FREELDR] Remove deprecated reactos loader code

Author: tkreuzer
Date: Thu Jan 21 20:43:08 2010
New Revision: 45191

URL: http://svn.reactos.org/svn/reactos?rev=45191&view=rev
Log:
[FREELDR]
Remove deprecated reactos loader code

Modified:
    branches/ros-amd64-bringup/reactos/boot/freeldr/freeldr/arch/amd64/loader.c

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/…
==============================================================================
--- 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] Thu Jan 21 20:43:08 2010
@@ -39,33 +39,6 @@
     /* Already done */
 }
 
-void
-DumpLoaderBlock()
-{
-	DbgPrint("LoaderBlock @ %p.\n", &LoaderBlock);
-	DbgPrint("Flags = 0x%x.\n", LoaderBlock.Flags);
-	DbgPrint("MemLower = 0x%p.\n", (PVOID)LoaderBlock.MemLower);
-	DbgPrint("MemHigher = 0x%p.\n", (PVOID)LoaderBlock.MemHigher);
-	DbgPrint("BootDevice = 0x%x.\n", LoaderBlock.BootDevice);
-	DbgPrint("CommandLine = %s.\n", LoaderBlock.CommandLine);
-	DbgPrint("ModsCount = 0x%x.\n", LoaderBlock.ModsCount);
-	DbgPrint("ModsAddr = 0x%p.\n", LoaderBlock.ModsAddr);
-	DbgPrint("Syms = 0x%s.\n", LoaderBlock.Syms);
-	DbgPrint("MmapLength = 0x%x.\n", LoaderBlock.MmapLength);
-	DbgPrint("MmapAddr = 0x%p.\n", (PVOID)LoaderBlock.MmapAddr);
-	DbgPrint("RdLength = 0x%x.\n", LoaderBlock.RdLength);
-	DbgPrint("RdAddr = 0x%p.\n", (PVOID)LoaderBlock.RdAddr);
-	DbgPrint("DrivesCount = 0x%x.\n", LoaderBlock.DrivesCount);
-	DbgPrint("DrivesAddr = 0x%p.\n", (PVOID)LoaderBlock.DrivesAddr);
-	DbgPrint("ConfigTable = 0x%x.\n", LoaderBlock.ConfigTable);
-	DbgPrint("BootLoaderName = 0x%x.\n", LoaderBlock.BootLoaderName);
-	DbgPrint("PageDirectoryStart = 0x%p.\n",
(PVOID)LoaderBlock.PageDirectoryStart);
-	DbgPrint("PageDirectoryEnd = 0x%p.\n", (PVOID)LoaderBlock.PageDirectoryEnd);
-	DbgPrint("KernelBase = 0x%p.\n", (PVOID)LoaderBlock.KernelBase);
-	DbgPrint("ArchExtra = 0x%p.\n", (PVOID)LoaderBlock.ArchExtra);
-
-}
-
 /*++
  * FrLdrStartup
  * INTERNAL
@@ -86,222 +59,7 @@
 NTAPI
 FrLdrStartup(ULONG Magic)
 {
-	/* Disable Interrupts */
-	_disable();
-
-	/* Re-initalize EFLAGS */
-	__writeeflags(0);
-
-	/* Initialize the page directory */
-	FrLdrSetupPageDirectory();
-
-	/* Set the new PML4 */
-	__writecr3((ULONGLONG)pPML4);
-
-	FrLdrSetupGdtIdt();
-
-	LoaderBlock.FrLdrDbgPrint = DbgPrint;
-
-//	DumpLoaderBlock();
-
-	DbgPrint("Jumping to kernel @ %p.\n", KernelEntryPoint);
-
-	/* Jump to Kernel */
-	(*KernelEntryPoint)(Magic, &LoaderBlock);
-
+	DbgPrint("ReactOS loader is unsupported! Halting.\n", KernelEntryPoint);
+    for(;;);
 }
 
-PPAGE_DIRECTORY_AMD64
-FrLdrGetOrCreatePageDir(PPAGE_DIRECTORY_AMD64 pDir, ULONG Index)
-{
-	PPAGE_DIRECTORY_AMD64 pSubDir;
-
-	if (!pDir)
-		return NULL;
-
-	if (!pDir->Pde[Index].Valid)
-	{
-		pSubDir = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
-		if (!pSubDir)
-			return NULL;
-		RtlZeroMemory(pSubDir, PAGE_SIZE);
-		pDir->Pde[Index].PageFrameNumber = PtrToPfn(pSubDir);
-		pDir->Pde[Index].Valid = 1;
-		pDir->Pde[Index].Write = 1;
-	}
-	else
-	{
-		pSubDir = (PPAGE_DIRECTORY_AMD64)((ULONGLONG)(pDir->Pde[Index].PageFrameNumber) *
PAGE_SIZE);
-	}
-	return pSubDir;
-}
-
-BOOLEAN
-FrLdrMapSinglePage(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress)
-{
-	PPAGE_DIRECTORY_AMD64 pDir3, pDir2, pDir1;
-	ULONG Index;
-
-	pDir3 = FrLdrGetOrCreatePageDir(pPML4, VAtoPXI(VirtualAddress));
-	pDir2 = FrLdrGetOrCreatePageDir(pDir3, VAtoPPI(VirtualAddress));
-	pDir1 = FrLdrGetOrCreatePageDir(pDir2, VAtoPDI(VirtualAddress));
-
-	if (!pDir1)
-		return FALSE;
-
-	Index = VAtoPTI(VirtualAddress);
-	if (pDir1->Pde[Index].Valid)
-	{
-		return FALSE;
-	}
-
-	pDir1->Pde[Index].Valid = 1;
-	pDir1->Pde[Index].Write = 1;
-	pDir1->Pde[Index].PageFrameNumber = PhysicalAddress / PAGE_SIZE;
-
-	return TRUE;
-}
-
-ULONG
-FrLdrMapRangeOfPages(ULONGLONG VirtualAddress, ULONGLONG PhysicalAddress, ULONG cPages)
-{
-	ULONG i;
-
-	for (i = 0; i < cPages; i++)
-	{
-		if (!FrLdrMapSinglePage(VirtualAddress, PhysicalAddress))
-		{
-			return i;
-		}
-		VirtualAddress += PAGE_SIZE;
-		PhysicalAddress += PAGE_SIZE;
-	}
-	return i;
-}
-
-
-/*++
- * FrLdrSetupPageDirectory
- * INTERNAL
- *
- *     Sets up the ReactOS Startup Page Directory.
- *
- * Params:
- *     None.
- *
- * Returns:
- *     None.
- *--*/
-VOID
-FASTCALL
-FrLdrSetupPageDirectory(VOID)
-{
-	ULONG KernelPages;
-	PVOID UserSharedData;
-
-	/* Allocate a Page for the PML4 */
-	pPML4 = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
-
-	ASSERT(pPML4);
-
-	/* The page tables are located at 0xfffff68000000000 
-	 * We create a recursive self mapping through all 4 levels at 
-	 * virtual address 0xfffff6fb7dbedf68 */
-	pPML4->Pde[VAtoPXI(PXE_BASE)].Valid = 1;
-	pPML4->Pde[VAtoPXI(PXE_BASE)].Write = 1;
-	pPML4->Pde[VAtoPXI(PXE_BASE)].PageFrameNumber = PtrToPfn(pPML4);
-
-	/* Setup low memory pages */
-	if (FrLdrMapRangeOfPages(0, 0, 1024) < 1024)
-	{
-		DbgPrint("Could not map low memory pages.\n");
-	}
-
-	/* Setup kernel pages */
-	KernelPages = (ROUND_TO_PAGES(NextModuleBase - KERNEL_BASE_PHYS) / PAGE_SIZE);
-	if (FrLdrMapRangeOfPages(KernelBase, KERNEL_BASE_PHYS, KernelPages) != KernelPages)
-	{
-		DbgPrint("Could not map %d kernel pages.\n", KernelPages);
-	}
-
-	/* Setup a page for the idt */
-	pIdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
-	IdtBase = KernelBase + KernelPages * PAGE_SIZE;
-	if (!FrLdrMapSinglePage(IdtBase, (ULONGLONG)pIdt))
-	{
-		DbgPrint("Could not map idt page.\n", KernelPages);
-	}
-
-	/* Setup a page for the gdt & tss */
-	pGdt = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
-	GdtBase = IdtBase + PAGE_SIZE;
-	TssBase = GdtBase + 20 * sizeof(ULONG64); // FIXME: don't hardcode
-	if (!FrLdrMapSinglePage(GdtBase, (ULONGLONG)pGdt))
-	{
-		DbgPrint("Could not map gdt page.\n", KernelPages);
-	}
-
-	/* Setup KUSER_SHARED_DATA page */
-	UserSharedData = MmAllocateMemoryWithType(PAGE_SIZE, LoaderSpecialMemory);
-	if (!FrLdrMapSinglePage(KI_USER_SHARED_DATA, (ULONG64)UserSharedData))
-	{
-		DbgPrint("Could not map KUSER_SHARED_DATA page.\n", KernelPages);
-	}
-
-	/* Map APIC page */
-	if (!FrLdrMapSinglePage(APIC_BASE, APIC_PHYS_BASE))
-	{
-		DbgPrint("Could not map APIC page.\n");
-	}
-
-}
-
-VOID
-FrLdrSetupGdtIdt()
-{
-	PKGDTENTRY64 Entry;
-	KDESCRIPTOR Desc;
-
-	RtlZeroMemory(pGdt, PAGE_SIZE);
-
-	/* Setup KGDT_64_R0_CODE */
-	Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_CODE);
-	*(PULONG64)Entry = 0x00209b0000000000ULL;
-
-	/* Setup KGDT_64_R0_SS */
-	Entry = KiGetGdtEntry(pGdt, KGDT_64_R0_SS);
-	*(PULONG64)Entry = 0x00cf93000000ffffULL;
-
-	/* Setup KGDT_64_DATA */
-	Entry = KiGetGdtEntry(pGdt, KGDT_64_DATA);
-	*(PULONG64)Entry = 0x00cff3000000ffffULL;
-
-	/* Setup KGDT_64_R3_CODE */
-	Entry = KiGetGdtEntry(pGdt, KGDT_64_R3_CODE);
-	*(PULONG64)Entry = 0x0020fb0000000000ULL;
-
-	/* Setup KGDT_32_R3_TEB */
-	Entry = KiGetGdtEntry(pGdt, KGDT_32_R3_TEB);
-	*(PULONG64)Entry = 0xff40f3fd50003c00ULL;
-
-	/* Setup TSS entry */
-	Entry = KiGetGdtEntry(pGdt, KGDT_TSS);
-	KiInitGdtEntry(Entry, TssBase, sizeof(KTSS), I386_TSS, 0);
-
-	/* Setup the gdt descriptor */
-	Desc.Limit = 12 * sizeof(ULONG64) - 1;
-	Desc.Base = (PVOID)GdtBase;
-
-	/* Set the new Gdt */
-	__lgdt(&Desc.Limit);
-	DbgPrint("Gdtr.Base = %p\n", Desc.Base);
-
-	/* Setup the idt descriptor */
-	Desc.Limit = 12 * sizeof(ULONG64) - 1;
-	Desc.Base = (PVOID)IdtBase;
-
-	/* Set the new Idt */
-	__lidt(&Desc.Limit);
-	DbgPrint("Idtr.Base = %p\n", Desc.Base);
-
-}