undo some buggy code for now

DarkFire01 · Nov 25, 2023 · 1fb5641 · 1fb5641
1 parent 35576bd
commit 1fb5641
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 66 deletions.
diff --git a/ntoskrnl/ke/freeze.c b/ntoskrnl/ke/freeze.c
@@ -56,19 +56,12 @@ KiFreezeTargetExecution(_In_ PKTRAP_FRAME TrapFrame,
 
 /* FUNCTIONS ******************************************************************/
 
+
 BOOLEAN
 NTAPI
 KeFreezeExecution(IN PKTRAP_FRAME TrapFrame,
                   IN PKEXCEPTION_FRAME ExceptionFrame)
 {
-#ifdef CONFIG_SMP
-    KAFFINITY TargetAffinity;
-    PKPRCB TargetPrcb;
-    KAFFINITY Current;
-    PKPRCB Prcb;
-    LONG i;
-#endif
-
     BOOLEAN Enable;
     KIRQL OldIrql;
 
@@ -92,27 +85,7 @@ KeFreezeExecution(IN PKTRAP_FRAME TrapFrame,
 #endif
 
 #ifdef CONFIG_SMP
-    Prcb = KeGetCurrentPrcb();
-    TargetAffinity = KeActiveProcessors;
-    TargetAffinity &= ~Prcb->SetMember;
-    if (TargetAffinity)
-    {
-        for (i = 0, Current = 1; i < KeNumberProcessors; i++, Current <<= 1)
-        {
-            if (TargetAffinity & Current)
-            {
-                /* stop target processor */
-                KiIpiSend(Current, IPI_FREEZE);
-                TargetPrcb = KiProcessorBlock[i];
-
-                /* Await for this processor to be frozen*/
-                while (TargetPrcb->IpiFrozen != IPI_FROZEN_HALTED)
-                {
-                    /* Do nothing, we're trying to synch */
-                }
-            }
-        }
-    }
+    // TODO: Add SMP support.
 #endif
 
     /* Save the old IRQL to be restored on unfreeze */
@@ -127,31 +100,7 @@ NTAPI
 KeThawExecution(IN BOOLEAN Enable)
 {
 #ifdef CONFIG_SMP
-    KAFFINITY TargetAffinity;
-    PKPRCB TargetPrcb;
-    KAFFINITY Current;
-    PKPRCB Prcb;
-    LONG i;
-
-    Prcb = KeGetCurrentPrcb();
-    TargetAffinity = KeActiveProcessors;
-    TargetAffinity &= ~Prcb->SetMember;
-
-    /* Loop through every processor */
-    for (i = 0, Current = 1; i < KeNumberProcessors; i++, Current <<= 1)
-    {
-        if (TargetAffinity & Current)
-        {
-            TargetPrcb = KiProcessorBlock[i];
-
-            /* Multiple processors can write this value */
-            InterlockedExchange((LONG*)&TargetPrcb->IpiFrozen, IPI_FROZEN_THAWING);
-            while (Prcb->IpiFrozen != IPI_FROZEN_RUNNING)
-            {
-                /* Do nothing we're waiting for ready */
-            }
-        }
-    }
+    // TODO: Add SMP support.
 #endif
 
     /* Clear the freeze flag */
@@ -168,4 +117,4 @@ KeThawExecution(IN BOOLEAN Enable)
 
     /* Re-enable interrupts */
     KeRestoreInterrupts(Enable);
-}
+}
diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c
@@ -811,17 +811,6 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY));
 
 AppCpuInit:
-    //TODO: We don't setup IPIs yet so freeze other processors here.
-    if (Cpu)
-    {
-        KeMemoryBarrier();
-        LoaderBlock->Prcb = 0;
-
-        for (;;)
-        {
-            YieldProcessor();
-        }
-    }
     /* Setup CPU-related fields */
     __writefsdword(KPCR_NUMBER, Cpu);
     __writefsdword(KPCR_SET_MEMBER, 1 << Cpu);
@@ -838,6 +827,18 @@ KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
     KeActiveProcessors |= __readfsdword(KPCR_SET_MEMBER);
     KeNumberProcessors++;
 
+    //TODO: We don't setup IPIs yet so freeze other processors here.
+    if (Cpu)
+    {
+        KeMemoryBarrier();
+        LoaderBlock->Prcb = 0;
+
+        for (;;)
+        {
+            YieldProcessor();
+        }
+    }
+
     /* Check if this is the boot CPU */
     if (!Cpu)
     {