Migrate KE subsystem to C++

2025-09-09 23:20:50 +02:00
parent 465a23633e
commit 4947f788d5
52 changed files with 2213 additions and 710 deletions
--- a/xtoskrnl/ke/i686/irq.cc
+++ b/xtoskrnl/ke/i686/irq.cc
@@ -1,14 +1,18 @@
 /**
 * PROJECT:         ExectOS
 * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/ke/i686/irqs.c
+ * FILE:            xtoskrnl/ke/i686/irq.cc
 * DESCRIPTION:     Kernel interrupts support for i686 architecture
 * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
 */

-#include <xtos.h>
+#include <xtos.hh>


+/* Kernel Library */
+namespace KE
+{
+
 /**
 * Sets new interrupt handler for the existing IDT entry.
 *
@@ -24,7 +28,7 @@
 */
 XTAPI
 VOID
-KeSetInterruptHandler(IN ULONG Vector,
+Irq::SetInterruptHandler(IN ULONG Vector,
                      IN PVOID Handler)
 {
    PKPROCESSOR_BLOCK ProcessorBlock;
@@ -36,3 +40,17 @@ KeSetInterruptHandler(IN ULONG Vector,
    ProcessorBlock->IdtBase[(UCHAR) Vector].Offset = (USHORT)((ULONG)Handler & 0xFFFF);
    ProcessorBlock->IdtBase[(UCHAR) Vector].ExtendedOffset = (USHORT)((ULONG)Handler >> 16);
 }
+
+} /* namespace */
+
+
+
+/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
+XTCLINK
+XTAPI
+VOID
+KeSetInterruptHandler(IN ULONG Vector,
+                      IN PVOID Handler)
+{
+    KE::Irq::SetInterruptHandler(Vector, Handler);
+}
--- a/xtoskrnl/ke/i686/krnlinit.cc
+++ b/xtoskrnl/ke/i686/krnlinit.cc
@@ -1,14 +1,18 @@
 /**
 * PROJECT:         ExectOS
 * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/ke/i686/krnlinit.c
+ * FILE:            xtoskrnl/ke/i686/krnlinit.cc
 * DESCRIPTION:     CPU architecture specific kernel initialization
 * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
 */

-#include <xtos.h>
+#include <xtos.hh>


+/* Kernel Library */
+namespace KE
+{
+
 /**
 * This routine initializes XT kernel.
 *
@@ -18,7 +22,7 @@
 */
 XTAPI
 VOID
-KepInitializeKernel(VOID)
+KernelInit::InitializeKernel(VOID)
 {
    XTSTATUS Status;

@@ -28,7 +32,7 @@ KepInitializeKernel(VOID)
    {
        /* Hardware layer initialization failed, kernel panic */
        DebugPrint(L"Failed to initialize hardware layer subsystem!\n");
-        KePanic(0);
+        Crash::Panic(0);
    }
 }

@@ -41,7 +45,7 @@ KepInitializeKernel(VOID)
 */
 XTAPI
 VOID
-KepInitializeMachine(VOID)
+KernelInit::InitializeMachine(VOID)
 {
    /* Re-enable IDE interrupts */
    HlIoPortOutByte(0x376, 0);
@@ -66,7 +70,7 @@ KepInitializeMachine(VOID)
 */
 XTAPI
 VOID
-KepStartKernel(VOID)
+KernelInit::StartKernel(VOID)
 {
    PKPROCESSOR_CONTROL_BLOCK Prcb;
    ULONG_PTR PageDirectory[2];
@@ -74,8 +78,8 @@ KepStartKernel(VOID)
    PKTHREAD CurrentThread;

    /* Get processor control block and current thread */
-    Prcb = KeGetCurrentProcessorControlBlock();
-    CurrentThread = KeGetCurrentThread();
+    Prcb = Processor::GetCurrentProcessorControlBlock();
+    CurrentThread = Processor::GetCurrentThread();

    /* Get current process */
    CurrentProcess = CurrentThread->ApcState.Process;
@@ -84,23 +88,22 @@ KepStartKernel(VOID)
    PoInitializeProcessorControlBlock(Prcb);

    /* Save processor state */
-    KepSaveProcessorState(&Prcb->ProcessorState);
+    Processor::SaveProcessorState(&Prcb->ProcessorState);

    /* Lower to APC runlevel */
-    KeLowerRunLevel(APC_LEVEL);
+    RunLevel::LowerRunLevel(APC_LEVEL);

    /* Initialize XTOS kernel */
-    KepInitializeKernel();
+    InitializeKernel();

    /* Initialize Idle process */
-    RtlInitializeListHead(&KepProcessListHead);
    PageDirectory[0] = 0;
    PageDirectory[1] = 0;
-    KeInitializeProcess(CurrentProcess, 0, MAXULONG_PTR, PageDirectory, FALSE);
+    KProcess::InitializeProcess(CurrentProcess, 0, MAXULONG_PTR, PageDirectory, FALSE);
    CurrentProcess->Quantum = MAXCHAR;

    /* Initialize Idle thread */
-    KeInitializeThread(CurrentProcess, CurrentThread, NULL, NULL, NULL, NULL, NULL, ArGetBootStack(), TRUE);
+    KThread::InitializeThread(CurrentProcess, CurrentThread, nullptr, nullptr, nullptr, nullptr, nullptr, ArGetBootStack(), TRUE);
    CurrentThread->NextProcessor = Prcb->CpuNumber;
    CurrentThread->Priority = THREAD_HIGH_PRIORITY;
    CurrentThread->State = Running;
@@ -109,12 +112,12 @@ KepStartKernel(VOID)
    CurrentProcess->ActiveProcessors |= (ULONG_PTR)1 << Prcb->CpuNumber;

    /* Enter infinite loop */
-    DebugPrint(L"KepStartKernel() finished. Entering infinite loop.\n");
-    for(;;);
+    DebugPrint(L"KernelInit::StartKernel() finished. Entering infinite loop.\n");
+    Crash::HaltSystem();
 }

 /**
- * Switches execution to a new boot stack and transfers control to the specified routine.
+ * Switches execution to a new boot stack and transfers control to the KernelInit::StartKernel() routine.
 *
 * @return This routine does not return any value.
 *
@@ -122,22 +125,30 @@ KepStartKernel(VOID)
 */
 XTAPI
 VOID
-KepSwitchBootStack()
+KernelInit::SwitchBootStack(VOID)
 {
-    /* Calculate the stack pointer at the top of the buffer, ensuring it is properly aligned as required by the ABI */
-    ULONG_PTR Stack = ((ULONG_PTR)ArGetBootStack() + KERNEL_STACK_SIZE) & ~(STACK_ALIGNMENT - 1);
+    ULONG_PTR Stack;
+    PVOID StartKernel;

-    /* Discard old stack frame, switch stack, make space for NPX and jump to KepStartKernel() */
+    /* Calculate the stack pointer at the top of the buffer, ensuring it is properly aligned as required by the ABI */
+    Stack = ((ULONG_PTR)ArGetBootStack() + KERNEL_STACK_SIZE) & ~(STACK_ALIGNMENT - 1);
+
+    /* Get address of KernelInit::StartKernel() */
+    StartKernel = (PVOID)KernelInit::StartKernel;
+
+    /* Discard old stack frame, switch stack, make space for NPX and jump to KernelInit::StartKernel() */
    __asm__ volatile("mov %0, %%edx\n"
                     "xor %%ebp, %%ebp\n"
                     "mov %%edx, %%esp\n"
                     "sub %1, %%esp\n"
                     "push %2\n"
-                     "jmp _KepStartKernel@0\n"
+                     "jmp *%3\n"
                     :
                     : "m" (Stack),
                       "i" (KTRAP_FRAME_ALIGN | KTRAP_FRAME_SIZE | NPX_FRAME_SIZE | KRETURN_ADDRESS_SIZE),
                       "i" (CR0_EM | CR0_MP | CR0_TS),
-                       "p" (KepStartKernel)
+                       "r" (StartKernel)
                     : "edx", "ebp", "esp", "memory");
 }
+
+} /* namespace */
--- a/xtoskrnl/ke/i686/kthread.cc
+++ b/xtoskrnl/ke/i686/kthread.cc
@@ -1,14 +1,18 @@
 /**
 * PROJECT:         ExectOS
 * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/ke/i686/kthread.c
+ * FILE:            xtoskrnl/ke/i686/kthread.cc
 * DESCRIPTION:     I686 thread manipulation support
 * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
 */

-#include <xtos.h>
+#include <xtos.hh>


+/* Kernel Library */
+namespace KE
+{
+
 /**
 * Initializes CPU architecture dependent context of a thread.
 *
@@ -33,17 +37,17 @@
 */
 XTAPI
 VOID
-KepInitializeThreadContext(IN PKTHREAD Thread,
-                           IN PKSYSTEM_ROUTINE SystemRoutine,
-                           IN PKSTART_ROUTINE StartRoutine,
-                           IN PVOID StartContext,
-                           IN PCONTEXT ContextRecord)
+KThread::InitializeThreadContext(IN PKTHREAD Thread,
+                                 IN PKSYSTEM_ROUTINE SystemRoutine,
+                                 IN PKSTART_ROUTINE StartRoutine,
+                                 IN PVOID StartContext,
+                                 IN PCONTEXT ContextRecord)
 {
    PKTHREAD_INIT_FRAME ThreadFrame;
    PFX_SAVE_FORMAT FxSaveFormat;

    /* Set initial thread frame */
-    ThreadFrame = (PKTHREAD_INIT_FRAME)(Thread->InitialStack - sizeof(KTHREAD_INIT_FRAME));
+    ThreadFrame = (PKTHREAD_INIT_FRAME)((ULONG_PTR)Thread->InitialStack - sizeof(KTHREAD_INIT_FRAME));

    /* Fill floating point save area with zeroes */
    RtlZeroMemory(&ThreadFrame->NpxFrame, sizeof(FX_SAVE_AREA));
@@ -114,3 +118,5 @@ KepInitializeThreadContext(IN PKTHREAD Thread,
    /* Set thread stack */
    Thread->KernelStack = &ThreadFrame->SwitchFrame;
 }
+
+} /* namespace */
--- a/xtoskrnl/ke/i686/proc.c
+++ b/xtoskrnl/ke/i686/proc.c
@@ -1,102 +0,0 @@
-/**
- * PROJECT:         ExectOS
- * COPYRIGHT:       See COPYING.md in the top level directory
- * FILE:            xtoskrnl/ke/i686/proc.c
- * DESCRIPTION:     I686 processor-related functionality for the kernel
- * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
- */
-
-#include <xtos.h>
-
-
-/**
- * Gets the processor block for the currently executing processor.
- *
- * @return This routine returns the current processor block read from the FS register.
- *
- * @since XT 1.0
- */
-XTAPI
-PKPROCESSOR_BLOCK
-KeGetCurrentProcessorBlock(VOID)
-{
-    /* Get processor block from FS register */
-    return (PKPROCESSOR_BLOCK)ArReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, Self));
-}
-
-/**
- * Gets the processor control block for the currently executing processor.
- *
- * @return This routine returns the current processor control block read from the FS register.
- *
- * @since XT 1.0
- */
-XTAPI
-PKPROCESSOR_CONTROL_BLOCK
-KeGetCurrentProcessorControlBlock(VOID)
-{
-    return (PKPROCESSOR_CONTROL_BLOCK)ArReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, CurrentPrcb));
-}
-
-/**
- * Gets the number of the currently executing processor.
- *
- * @return This routine returns the zero-indexed processor number.
- *
- * @since XT 1.0
- */
-XTAPI
-ULONG
-KeGetCurrentProcessorNumber(VOID)
-{
-    return (ULONG)ArReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, CpuNumber));
-}
-
-/**
- * Gets the current thread running on the currently executing processor.
- *
- * @return This routine returns the address of the current thread object.
- *
- * @since NT 3.5
- */
-XTAPI
-PKTHREAD
-KeGetCurrentThread(VOID)
-{
-    return (PKTHREAD)ArReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, Prcb.CurrentThread));
-}
-
-/**
- * Saves the current processor state.
- *
- * @param State
- *        Supplies a pointer to the processor state structure.
- *
- * @return This routine does not return any value.
- *
- * @since XT 1.0
- */
-XTAPI
-VOID
-KepSaveProcessorState(OUT PKPROCESSOR_STATE CpuState)
-{
-    /* Save CR registers */
-    CpuState->SpecialRegisters.Cr0 = ArReadControlRegister(0);
-    CpuState->SpecialRegisters.Cr2 = ArReadControlRegister(2);
-    CpuState->SpecialRegisters.Cr3 = ArReadControlRegister(3);
-    CpuState->SpecialRegisters.Cr4 = ArReadControlRegister(4);
-
-    /* Save DR registers */
-    CpuState->SpecialRegisters.KernelDr0 = ArReadDebugRegister(0);
-    CpuState->SpecialRegisters.KernelDr1 = ArReadDebugRegister(1);
-    CpuState->SpecialRegisters.KernelDr2 = ArReadDebugRegister(2);
-    CpuState->SpecialRegisters.KernelDr3 = ArReadDebugRegister(3);
-    CpuState->SpecialRegisters.KernelDr6 = ArReadDebugRegister(6);
-    CpuState->SpecialRegisters.KernelDr7 = ArReadDebugRegister(7);
-
-    /* Save GDT, IDT, LDT and TaskRegister */
-    ArStoreGlobalDescriptorTable(&CpuState->SpecialRegisters.Gdtr.Limit);
-    ArStoreInterruptDescriptorTable(&CpuState->SpecialRegisters.Idtr.Limit);
-    ArStoreLocalDescriptorTable(&CpuState->SpecialRegisters.Ldtr);
-    ArStoreTaskRegister(&CpuState->SpecialRegisters.Tr);
-}
--- a/xtoskrnl/ke/i686/proc.cc
+++ b/xtoskrnl/ke/i686/proc.cc
@@ -0,0 +1,150 @@
+/**
+ * PROJECT:         ExectOS
+ * COPYRIGHT:       See COPYING.md in the top level directory
+ * FILE:            xtoskrnl/ke/i686/proc.c
+ * DESCRIPTION:     I686 processor-related functionality for the kernel
+ * DEVELOPERS:      Rafal Kupiec <belliash@codingworkshop.eu.org>
+ */
+
+#include <xtos.hh>
+
+
+/* Kernel Library */
+namespace KE
+{
+
+/**
+ * Gets the processor block for the currently executing processor.
+ *
+ * @return This routine returns the current processor block read from the FS register.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+PKPROCESSOR_BLOCK
+Processor::GetCurrentProcessorBlock(VOID)
+{
+    /* Get processor block from FS register */
+    return (PKPROCESSOR_BLOCK)AR::CpuFunc::ReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, Self));
+}
+
+/**
+ * Gets the processor control block for the currently executing processor.
+ *
+ * @return This routine returns the current processor control block read from the FS register.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+PKPROCESSOR_CONTROL_BLOCK
+Processor::GetCurrentProcessorControlBlock(VOID)
+{
+    return (PKPROCESSOR_CONTROL_BLOCK)AR::CpuFunc::ReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, CurrentPrcb));
+}
+
+/**
+ * Gets the number of the currently executing processor.
+ *
+ * @return This routine returns the zero-indexed processor number.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+ULONG
+Processor::GetCurrentProcessorNumber(VOID)
+{
+    return (ULONG)AR::CpuFunc::ReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, CpuNumber));
+}
+
+/**
+ * Gets the current thread running on the currently executing processor.
+ *
+ * @return This routine returns the address of the current thread object.
+ *
+ * @since NT 3.5
+ */
+XTAPI
+PKTHREAD
+Processor::GetCurrentThread(VOID)
+{
+    return (PKTHREAD)AR::CpuFunc::ReadFSDualWord(FIELD_OFFSET(KPROCESSOR_BLOCK, Prcb.CurrentThread));
+}
+
+/**
+ * Saves the current processor state.
+ *
+ * @param State
+ *        Supplies a pointer to the processor state structure.
+ *
+ * @return This routine does not return any value.
+ *
+ * @since XT 1.0
+ */
+XTAPI
+VOID
+Processor::SaveProcessorState(OUT PKPROCESSOR_STATE CpuState)
+{
+    /* Save CR registers */
+    CpuState->SpecialRegisters.Cr0 = AR::CpuFunc::ReadControlRegister(0);
+    CpuState->SpecialRegisters.Cr2 = AR::CpuFunc::ReadControlRegister(2);
+    CpuState->SpecialRegisters.Cr3 = AR::CpuFunc::ReadControlRegister(3);
+    CpuState->SpecialRegisters.Cr4 = AR::CpuFunc::ReadControlRegister(4);
+
+    /* Save DR registers */
+    CpuState->SpecialRegisters.KernelDr0 = AR::CpuFunc::ReadDebugRegister(0);
+    CpuState->SpecialRegisters.KernelDr1 = AR::CpuFunc::ReadDebugRegister(1);
+    CpuState->SpecialRegisters.KernelDr2 = AR::CpuFunc::ReadDebugRegister(2);
+    CpuState->SpecialRegisters.KernelDr3 = AR::CpuFunc::ReadDebugRegister(3);
+    CpuState->SpecialRegisters.KernelDr6 = AR::CpuFunc::ReadDebugRegister(6);
+    CpuState->SpecialRegisters.KernelDr7 = AR::CpuFunc::ReadDebugRegister(7);
+
+    /* Save GDT, IDT, LDT and TaskRegister */
+    AR::CpuFunc::StoreGlobalDescriptorTable(&CpuState->SpecialRegisters.Gdtr.Limit);
+    AR::CpuFunc::StoreInterruptDescriptorTable(&CpuState->SpecialRegisters.Idtr.Limit);
+    AR::CpuFunc::StoreLocalDescriptorTable(&CpuState->SpecialRegisters.Ldtr);
+    AR::CpuFunc::StoreTaskRegister(&CpuState->SpecialRegisters.Tr);
+}
+
+} /* namespace */
+
+
+
+/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
+XTAPI
+PKPROCESSOR_BLOCK
+KeGetCurrentProcessorBlock(VOID)
+{
+    return KE::Processor::GetCurrentProcessorBlock();
+}
+
+/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
+XTAPI
+PKPROCESSOR_CONTROL_BLOCK
+KeGetCurrentProcessorControlBlock(VOID)
+{
+    return KE::Processor::GetCurrentProcessorControlBlock();
+}
+
+/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
+XTAPI
+ULONG
+KeGetCurrentProcessorNumber(VOID)
+{
+    return KE::Processor::GetCurrentProcessorNumber();
+}
+
+/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
+XTAPI
+PKTHREAD
+KeGetCurrentThread(VOID)
+{
+    return KE::Processor::GetCurrentThread();
+}
+
+/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
+XTAPI
+VOID
+KepSaveProcessorState(OUT PKPROCESSOR_STATE CpuState)
+{
+    KE::Processor::SaveProcessorState(CpuState);
+}