[ros-diffs] [sginsberg] 43549: - Use DBG_STATUS_CONTROL_C instead of magic "1" - Add missing KdPollBreakIn + DbgBreakPointWithStatus to ARM initialization - Fix initialization of the D and I cache fields in the PCR -- it was always setting the second level

Author: sginsberg
Date: Sun Oct 18 13:50:34 2009
New Revision: 43549

URL: http://svn.reactos.org/svn/reactos?rev=43549&view=rev
Log:
- Use DBG_STATUS_CONTROL_C instead of magic "1"
- Add missing KdPollBreakIn + DbgBreakPointWithStatus to ARM initialization
- Fix initialization of the D and I cache fields in the PCR -- it was always setting the
second level

Modified:
    trunk/reactos/ntoskrnl/ke/arm/kiinit.c
    trunk/reactos/ntoskrnl/ke/i386/kiinit.c
    trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c

Modified: trunk/reactos/ntoskrnl/ke/arm/kiinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/kiinit.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/arm/kiinit.c [iso-8859-1] Sun Oct 18 13:50:34 2009
@@ -187,6 +187,11 @@
         KdInitSystem(0, LoaderBlock);
 
         //
+        // Check for break-in
+        //
+        if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
+
+        //
         // Cleanup the rest of the processor block array
         //
         for (i = 1; i < MAXIMUM_PROCESSORS; i++) KiProcessorBlock[i] = NULL;
@@ -372,20 +377,20 @@
     //
     // Set global d-cache fill and alignment values
     //
-    if (Pcr->SecondLevelDcacheSize)
+    if (!Pcr->SecondLevelDcacheSize)
     {
         //
         // Use the first level
         //
+        Pcr->DcacheFillSize = Pcr->FirstLevelDcacheSize;
+    }
+    else
+    {
+        //
+        // Use the second level
+        //
         Pcr->DcacheFillSize = Pcr->SecondLevelDcacheSize;
     }
-    else
-    {
-        //
-        // Use the second level
-        //
-        Pcr->DcacheFillSize = Pcr->SecondLevelDcacheSize;
-    }
     
     //
     // Set the alignment
@@ -395,12 +400,12 @@
     //
     // Set global i-cache fill and alignment values
     //
-    if (Pcr->SecondLevelIcacheSize)
+    if (!Pcr->SecondLevelIcacheSize)
     {
         //
         // Use the first level
         //
-        Pcr->IcacheFillSize = Pcr->SecondLevelIcacheSize;
+        Pcr->IcacheFillSize = Pcr->FirstLevelIcacheSize;
     }
     else
     {

Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sun Oct 18 13:50:34 2009
@@ -752,7 +752,7 @@
         KdInitSystem(0, KeLoaderBlock);
 
         /* Check for break-in */
-        if (KdPollBreakIn()) DbgBreakPointWithStatus(1);
+        if (KdPollBreakIn()) DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
     }
 
     /* Raise to HIGH_LEVEL */

Modified: trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/kiinit…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ke/powerpc/kiinit.c [iso-8859-1] Sun Oct 18 13:50:34 2009
@@ -329,7 +329,7 @@
     /* Check for break-in */
     if (KdPollBreakIn())
     {
-	DbgBreakPointWithStatus(1);
+	DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C);
     }
 
     /* Raise to HIGH_LEVEL */