[ros-diffs] [ros-arm-bringup] 32370: 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.

Author: ros-arm-bringup
Date: Fri Feb 15 03:50:26 2008
New Revision: 32370

URL: http://svn.reactos.org/svn/reactos?rev=32370&view=rev
Log:
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.

Modified:
    trunk/reactos/ntoskrnl/ke/freeldr.c
    trunk/reactos/ntoskrnl/mm/mminit.c

Modified: trunk/reactos/ntoskrnl/ke/freeldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/freeldr.c (original)
+++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Feb 15 03:50:26 2008
@@ -906,7 +906,7 @@
 {
     PLOADER_PARAMETER_BLOCK LoaderBlock;
     PLDR_DATA_TABLE_ENTRY LdrEntry;
-    PLOADER_MODULE RosEntry;
+    PLOADER_MODULE RosEntry = NULL;
     ULONG i, j, ModSize;
     PVOID ModStart;
     PCHAR DriverName;
@@ -1147,6 +1147,14 @@
         InsertTailList(&LoaderBlock->LoadOrderListHead,
                        &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;

Modified: trunk/reactos/ntoskrnl/mm/mminit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/mminit.c (original)
+++ trunk/reactos/ntoskrnl/mm/mminit.c Fri Feb 15 03:50:26 2008
@@ -348,7 +348,7 @@
     PLDR_DATA_TABLE_ENTRY LdrEntry;
     
     /* Dump memory descriptors */
-    if (TRUE) MiDbgDumpMemoryDescriptors();
+    if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors();
     if (MiDbgEnableMdDump) MiDbgDumpBiosMap(BIOSMemoryMap, AddressRangeCount);
 
     /* Set the page directory */