diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal@nekernel.org> | 2025-03-28 19:57:33 +0100 |
| commit | ba7b3ed69cd24970a28b72c54982735cd120e663 (patch) | |
| tree | 934b7645435ab1bfd2d8eb99fa861fc09e3dd5b4 /dev/kernel/HALKit/AMD64/HalKernelMain.cc | |
| parent | 2205e801a6e84238dc8cbbb8f9de5a675eae1d81 (diff) | |
kernel: breaking: Change namespace from NeOS to Kernel.
sched: Fix redundancy in NeKernel's user scheduler macros, refactored
the other files using the redundant macros too.
part one of a series of commit for NeKernel.
Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
Diffstat (limited to 'dev/kernel/HALKit/AMD64/HalKernelMain.cc')
| -rw-r--r-- | dev/kernel/HALKit/AMD64/HalKernelMain.cc | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/dev/kernel/HALKit/AMD64/HalKernelMain.cc b/dev/kernel/HALKit/AMD64/HalKernelMain.cc index 543e267b..fadb37e4 100644 --- a/dev/kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/kernel/HALKit/AMD64/HalKernelMain.cc @@ -14,33 +14,33 @@ #include <CFKit/Property.h> #include <modules/CoreGfx/TextMgr.h> -EXTERN_C NeOS::VoidPtr kInterruptVectorTable[]; -EXTERN_C NeOS::VoidPtr mp_user_switch_proc; -EXTERN_C NeOS::Char mp_user_switch_proc_stack_begin[]; +EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; +EXTERN_C Kernel::VoidPtr mp_user_switch_proc; +EXTERN_C Kernel::Char mp_user_switch_proc_stack_begin[]; -STATIC NeOS::Void hal_init_scheduler_team() +STATIC Kernel::Void hal_init_scheduler_team() { - for (NeOS::SizeT i = 0U; i < NeOS::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) + for (Kernel::SizeT i = 0U; i < Kernel::UserProcessScheduler::The().CurrentTeam().AsArray().Count(); ++i) { - NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = NeOS::UserProcess(); - NeOS::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = NeOS::ProcessStatusKind::kKilled; + Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i] = Kernel::UserProcess(); + Kernel::UserProcessScheduler::The().CurrentTeam().AsArray()[i].Status = Kernel::ProcessStatusKind::kKilled; } } -STATIC NeOS::UInt64 hal_rdtsc_fn() +STATIC Kernel::UInt64 hal_rdtsc_fn() { - NeOS::UInt32 lo, hi; + Kernel::UInt32 lo, hi; __asm__ volatile("rdtsc" : "=a"(lo), "=d"(hi)); - return ((NeOS::UInt64)hi << 32) | lo; + return ((Kernel::UInt64)hi << 32) | lo; } -STATIC NeOS::UInt64 kStartTim, kEndTim; +STATIC Kernel::UInt64 kStartTim, kEndTim; /// @brief Kernel init procedure. EXTERN_C void hal_init_platform( - NeOS::HEL::BootInfoHeader* handover_hdr) + Kernel::HEL::BootInfoHeader* handover_hdr) { kStartTim = hal_rdtsc_fn(); @@ -59,8 +59,8 @@ EXTERN_C void hal_init_platform( /************************************** */ kKernelBitMpSize = kHandoverHeader->f_BitMapSize; - kKernelBitMpStart = reinterpret_cast<NeOS::VoidPtr>( - reinterpret_cast<NeOS::UIntPtr>(kHandoverHeader->f_BitMapStart)); + kKernelBitMpStart = reinterpret_cast<Kernel::VoidPtr>( + reinterpret_cast<Kernel::UIntPtr>(kHandoverHeader->f_BitMapStart)); /************************************** */ /* INITIALIZE GDT AND SEGMENTS. */ @@ -69,7 +69,7 @@ EXTERN_C void hal_init_platform( STATIC CONST auto kGDTEntriesCount = 6; /* GDT, mostly descriptors for user and kernel segments. */ - STATIC NeOS::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { + STATIC Kernel::HAL::Detail::NE_GDT_ENTRY ALIGN(0x08) kGDTArray[kGDTEntriesCount] = { {.fLimitLow = 0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x00, .fFlags = 0x00, .fBaseHigh = 0}, // Null entry {.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x9A, .fFlags = 0xAF, .fBaseHigh = 0}, // Kernel code {.fLimitLow = 0x0, .fBaseLow = 0, .fBaseMid = 0, .fAccessByte = 0x92, .fFlags = 0xCF, .fBaseHigh = 0}, // Kernel data @@ -78,35 +78,35 @@ EXTERN_C void hal_init_platform( }; // Load memory descriptors. - NeOS::HAL::RegisterGDT gdt_reg; + Kernel::HAL::RegisterGDT gdt_reg; - gdt_reg.Base = reinterpret_cast<NeOS::UIntPtr>(kGDTArray); - gdt_reg.Limit = (sizeof(NeOS::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; + gdt_reg.Base = reinterpret_cast<Kernel::UIntPtr>(kGDTArray); + gdt_reg.Limit = (sizeof(Kernel::HAL::Detail::NE_GDT_ENTRY) * kGDTEntriesCount) - 1; FB::fb_clear_video(); //! GDT will load hal_read_init after it successfully loads the segments. - NeOS::HAL::GDTLoader gdt_loader; + Kernel::HAL::GDTLoader gdt_loader; gdt_loader.Load(gdt_reg); - NeOS::ke_panic(RUNTIME_CHECK_BOOTSTRAP); + Kernel::ke_panic(RUNTIME_CHECK_BOOTSTRAP); } -EXTERN_C NeOS::Void hal_real_init(NeOS::Void) noexcept +EXTERN_C Kernel::Void hal_real_init(Kernel::Void) noexcept { - NeOS::NeFS::fs_init_nefs(); + Kernel::NeFS::fs_init_nefs(); - NeOS::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); + Kernel::HAL::mp_get_cores(kHandoverHeader->f_HardwareTables.f_VendorPtr); - NeOS::HAL::Register64 idt_reg; + Kernel::HAL::Register64 idt_reg; - idt_reg.Base = (NeOS::UIntPtr)kInterruptVectorTable; + idt_reg.Base = (Kernel::UIntPtr)kInterruptVectorTable; - NeOS::HAL::IDTLoader idt_loader; + Kernel::HAL::IDTLoader idt_loader; kEndTim = hal_rdtsc_fn(); - kout << "Cycles Spent Before Userland: " << NeOS::number(kEndTim - kStartTim) << kendl; + kout << "Cycles Spent Before Userland: " << Kernel::number(kEndTim - kStartTim) << kendl; idt_loader.Load(idt_reg); |
