Refactor AR subsystem

2025-09-11 20:23:51 +02:00
parent 96043f3d70
commit 3a11d536d5
10 changed files with 223 additions and 301 deletions
--- a/xtoskrnl/ar/i686/procsup.cc
+++ b/xtoskrnl/ar/i686/procsup.cc
@@ -9,10 +9,6 @@
 #include <xtos.hh>


-/* Architecture-specific Library */
-namespace AR
-{
-
 /**
 * Gets the base address of the kernel boot stack.
 *
@@ -20,7 +16,9 @@ namespace AR
 *
 * @since XT 1.0
 */
-PVOID ProcSup::GetBootStack(VOID)
+XTAPI
+PVOID
+AR::ProcSup::GetBootStack(VOID)
 {
    return (PVOID)BootStack;
 }
@@ -35,7 +33,7 @@ PVOID ProcSup::GetBootStack(VOID)
 */
 XTAPI
 VOID
-ProcSup::IdentifyProcessor(VOID)
+AR::ProcSup::IdentifyProcessor(VOID)
 {
    PKPROCESSOR_CONTROL_BLOCK Prcb;
    CPUID_REGISTERS CpuRegisters;
@@ -111,7 +109,7 @@ ProcSup::IdentifyProcessor(VOID)
 */
 XTAPI
 VOID
-ProcSup::InitializeProcessor(IN PVOID ProcessorStructures)
+AR::ProcSup::InitializeProcessor(IN PVOID ProcessorStructures)
 {
    KDESCRIPTOR GdtDescriptor, IdtDescriptor;
    PVOID KernelBootStack, KernelFaultStack;
@@ -185,7 +183,7 @@ ProcSup::InitializeProcessor(IN PVOID ProcessorStructures)
 */
 XTAPI
 VOID
-ProcSup::InitializeGdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
+AR::ProcSup::InitializeGdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
 {
    /* Initialize GDT entries */
    SetGdtEntry(ProcessorBlock->GdtBase, KGDT_NULL, 0x0, 0x0, KGDT_TYPE_NONE, KGDT_DPL_SYSTEM, 0);
@@ -216,7 +214,7 @@ ProcSup::InitializeGdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
 */
 XTAPI
 VOID
-ProcSup::InitializeIdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
+AR::ProcSup::InitializeIdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
 {
    UINT Vector;

@@ -275,11 +273,11 @@ ProcSup::InitializeIdt(IN PKPROCESSOR_BLOCK ProcessorBlock)
 */
 XTAPI
 VOID
-ProcSup::InitializeProcessorBlock(OUT PKPROCESSOR_BLOCK ProcessorBlock,
-                                  IN PKGDTENTRY Gdt,
-                                  IN PKIDTENTRY Idt,
-                                  IN PKTSS Tss,
-                                  IN PVOID DpcStack)
+AR::ProcSup::InitializeProcessorBlock(OUT PKPROCESSOR_BLOCK ProcessorBlock,
+                                      IN PKGDTENTRY Gdt,
+                                      IN PKIDTENTRY Idt,
+                                      IN PKTSS Tss,
+                                      IN PVOID DpcStack)
 {
    /* Set processor block and processor control block */
    ProcessorBlock->Self = ProcessorBlock;
@@ -321,7 +319,7 @@ ProcSup::InitializeProcessorBlock(OUT PKPROCESSOR_BLOCK ProcessorBlock,
 */
 XTAPI
 VOID
-ProcSup::InitializeProcessorRegisters(VOID)
+AR::ProcSup::InitializeProcessorRegisters(VOID)
 {
    /* Clear EFLAGS register */
    CpuFunc::WriteEflagsRegister(0);
@@ -357,12 +355,12 @@ ProcSup::InitializeProcessorRegisters(VOID)
 */
 XTAPI
 VOID
-ProcSup::InitializeProcessorStructures(IN PVOID ProcessorStructures,
-                                       OUT PKGDTENTRY *Gdt,
-                                       OUT PKTSS *Tss,
-                                       OUT PKPROCESSOR_BLOCK *ProcessorBlock,
-                                       OUT PVOID *KernelBootStack,
-                                       OUT PVOID *KernelFaultStack)
+AR::ProcSup::InitializeProcessorStructures(IN PVOID ProcessorStructures,
+                                           OUT PKGDTENTRY *Gdt,
+                                           OUT PKTSS *Tss,
+                                           OUT PKPROCESSOR_BLOCK *ProcessorBlock,
+                                           OUT PVOID *KernelBootStack,
+                                           OUT PVOID *KernelFaultStack)
 {
    UINT_PTR Address;

@@ -397,7 +395,7 @@ ProcSup::InitializeProcessorStructures(IN PVOID ProcessorStructures,
 */
 XTAPI
 VOID
-ProcSup::InitializeSegments(VOID)
+AR::ProcSup::InitializeSegments(VOID)
 {
    /* Initialize segments */
    CpuFunc::LoadSegment(SEGMENT_CS, KGDT_R0_CODE);
@@ -418,9 +416,9 @@ ProcSup::InitializeSegments(VOID)
 */
 XTAPI
 VOID
-ProcSup::InitializeTss(IN PKPROCESSOR_BLOCK ProcessorBlock,
-                       IN PVOID KernelBootStack,
-                       IN PVOID KernelFaultStack)
+AR::ProcSup::InitializeTss(IN PKPROCESSOR_BLOCK ProcessorBlock,
+                           IN PVOID KernelBootStack,
+                           IN PVOID KernelFaultStack)
 {
    /* Clear I/O map */
    RtlSetMemory(ProcessorBlock->TssBase->IoMaps[0].IoMap, 0xFF, IOPM_FULL_SIZE);
@@ -467,8 +465,8 @@ ProcSup::InitializeTss(IN PKPROCESSOR_BLOCK ProcessorBlock,
 */
 XTAPI
 VOID
-ProcSup::SetDoubleFaultTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
-                                IN PVOID KernelFaultStack)
+AR::ProcSup::SetDoubleFaultTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
+                                    IN PVOID KernelFaultStack)
 {
    PKGDTENTRY TaskGateEntry, TssEntry;
    PKTSS Tss;
@@ -538,13 +536,13 @@ ProcSup::SetDoubleFaultTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
 */
 XTAPI
 VOID
-ProcSup::SetGdtEntry(IN PKGDTENTRY Gdt,
-                     IN USHORT Selector,
-                     IN ULONG_PTR Base,
-                     IN ULONG Limit,
-                     IN UCHAR Type,
-                     IN UCHAR Dpl,
-                     IN UCHAR SegmentMode)
+AR::ProcSup::SetGdtEntry(IN PKGDTENTRY Gdt,
+                         IN USHORT Selector,
+                         IN ULONG_PTR Base,
+                         IN ULONG Limit,
+                         IN UCHAR Type,
+                         IN UCHAR Dpl,
+                         IN UCHAR SegmentMode)
 {
    PKGDTENTRY GdtEntry;
    UCHAR Granularity;
@@ -602,9 +600,9 @@ ProcSup::SetGdtEntry(IN PKGDTENTRY Gdt,
 */
 XTAPI
 VOID
-ProcSup::SetGdtEntryBase(IN PKGDTENTRY Gdt,
-                         IN USHORT Selector,
-                         IN ULONG_PTR Base)
+AR::ProcSup::SetGdtEntryBase(IN PKGDTENTRY Gdt,
+                             IN USHORT Selector,
+                             IN ULONG_PTR Base)
 {
    PKGDTENTRY GdtEntry;

@@ -644,12 +642,12 @@ ProcSup::SetGdtEntryBase(IN PKGDTENTRY Gdt,
 */
 XTAPI
 VOID
-ProcSup::SetIdtGate(IN PKIDTENTRY Idt,
-                    IN USHORT Vector,
-                    IN PVOID Handler,
-                    IN USHORT Selector,
-                    IN USHORT Ist,
-                    IN USHORT Access)
+AR::ProcSup::SetIdtGate(IN PKIDTENTRY Idt,
+                        IN USHORT Vector,
+                        IN PVOID Handler,
+                        IN USHORT Selector,
+                        IN USHORT Ist,
+                        IN USHORT Access)
 {
    /* Setup the gate */
    Idt[Vector].Offset = (USHORT)((ULONG)Handler & 0xFFFF);
@@ -670,8 +668,8 @@ ProcSup::SetIdtGate(IN PKIDTENTRY Idt,
 */
 XTAPI
 VOID
-ProcSup::SetNonMaskableInterruptTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
-                                         IN PVOID KernelFaultStack)
+AR::ProcSup::SetNonMaskableInterruptTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
+                                             IN PVOID KernelFaultStack)
 {
    PKGDTENTRY TaskGateEntry, TssEntry;
    PKTSS Tss;
@@ -709,24 +707,3 @@ ProcSup::SetNonMaskableInterruptTssEntry(IN PKPROCESSOR_BLOCK ProcessorBlock,
    TssEntry->Bits.Present = 1;
    TssEntry->Bits.Type = I686_TSS;
 }
-
-} /* namespace */
-
-
-/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
-XTCLINK
-XTAPI
-PVOID
-ArGetBootStack(VOID)
-{
-    return AR::ProcSup::GetBootStack();
-}
-
-/* TEMPORARY FOR COMPATIBILITY WITH C CODE */
-XTCLINK
-XTAPI
-VOID
-ArInitializeProcessor(IN PVOID ProcessorStructures)
-{
-    AR::ProcSup::InitializeProcessor(ProcessorStructures);
-}