Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-04 13:21:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove accidentally enabled debugging function, and apply the FreeLDR 6MB hack when building the ARC Memory Descriptor List as well. This will reflect the memory in use (thus representing the ARC-based glorious hack) when parsing the memory descriptor list, something we'll soon have to do in MmInitializePageList.

Browse source 
svn path=/trunk/; revision=32370
This commit is contained in:
ReactOS Portable Systems Group 2008-02-15 00:50:26 +00:00
parent cb5d314ff3
commit d6cd3275f2
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/ntoskrnl/ke/freeldr.c
View file

@ -906,7 +906,7 @@ KiRosFrldrLpbToNtLpb(IN PROS_LOADER_PARAMETER_BLOCK RosLoaderBlock,
{
PLOADER_PARAMETER_BLOCK LoaderBlock;
PLDR_DATA_TABLE_ENTRY LdrEntry;
PLOADER_MODULE RosEntry;
PLOADER_MODULE RosEntry = NULL;
ULONG i, j, ModSize;
PVOID ModStart;
PCHAR DriverName;
@ -1148,6 +1148,14 @@ KiRosFrldrLpbToNtLpb(IN PROS_LOADER_PARAMETER_BLOCK RosLoaderBlock,
&LdrEntry->InLoadOrderLinks);
}
/* Now mark the remainder of the FreeLDR 6MB area as "in use" */
KiRosAllocateNtDescriptor(LoaderMemoryData,
KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd),
KERNEL_DESCRIPTOR_PAGE((0x80800000 + 0x600000)) -
KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd),
0,
&Base);
/* Setup command line */
LoaderBlock->LoadOptions = BldrCommandLine;
strcpy(BldrCommandLine, RosLoaderBlock->CommandLine);

2
reactos/ntoskrnl/mm/mminit.c
View file

@ -348,7 +348,7 @@ MmInit1(IN PADDRESS_RANGE BIOSMemoryMap,
PLDR_DATA_TABLE_ENTRY LdrEntry;
/* Dump memory descriptors */
if (TRUE) MiDbgDumpMemoryDescriptors();
if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors();
if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount);
/* Set the page directory */