diff options
Diffstat (limited to 'dev/kernel/KernelKit')
35 files changed, 181 insertions, 181 deletions
diff --git a/dev/kernel/KernelKit/BinaryMutex.h b/dev/kernel/KernelKit/BinaryMutex.h index 21b2ca6d..bb571a37 100644 --- a/dev/kernel/KernelKit/BinaryMutex.h +++ b/dev/kernel/KernelKit/BinaryMutex.h @@ -10,7 +10,7 @@ #include <KernelKit/Timer.h> #include <CompilerKit/CompilerKit.h> -namespace NeOS +namespace Kernel { class UserProcess; @@ -40,4 +40,4 @@ namespace NeOS private: UserProcessRef fLockingProcess; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/CodeMgr.h b/dev/kernel/KernelKit/CodeMgr.h index 5f83c74b..15ec420e 100644 --- a/dev/kernel/KernelKit/CodeMgr.h +++ b/dev/kernel/KernelKit/CodeMgr.h @@ -18,7 +18,7 @@ #include <KernelKit/PEFCodeMgr.h> #include <KernelKit/IPEFDylibObject.h> -namespace NeOS +namespace Kernel { /// @brief Main process entrypoint. typedef void (*rtl_main_kind)(const SizeT argc, Char** argv, Char** envp, const SizeT envp_len); @@ -34,4 +34,4 @@ namespace NeOS /// @param main the start of the process. /// @return The team's process id. ProcessID rtl_create_process(rtl_main_kind main, const Char* process_name) noexcept; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/DebugOutput.h b/dev/kernel/KernelKit/DebugOutput.h index cfadd38d..aa12518f 100644 --- a/dev/kernel/KernelKit/DebugOutput.h +++ b/dev/kernel/KernelKit/DebugOutput.h @@ -25,7 +25,7 @@ #define kDebugTeam 43 #define kDebugEOP 49 -namespace NeOS +namespace Kernel { class TerminalDevice; class DTraceDevice; @@ -202,12 +202,12 @@ namespace NeOS src = number(num); return src; } -} // namespace NeOS +} // namespace Kernel #ifdef kout #undef kout #endif // ifdef kout -#define kout NeOS::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " +#define kout Kernel::TerminalDevice::The() << "[NeKernel] *" << __FILE__ << "*: " -#define kendl NeOS::TerminalDevice::The() << NeOS::end_line() +#define kendl Kernel::TerminalDevice::The() << Kernel::end_line() diff --git a/dev/kernel/KernelKit/Defines.h b/dev/kernel/KernelKit/Defines.h index d86988a7..d2e59535 100644 --- a/dev/kernel/KernelKit/Defines.h +++ b/dev/kernel/KernelKit/Defines.h @@ -12,4 +12,5 @@ #define KERNELKIT_VERSION_BCD 0x01020 class UserProcessScheduler; +class IDylibObject; class UserProcess; diff --git a/dev/kernel/KernelKit/DeviceMgr.h b/dev/kernel/KernelKit/DeviceMgr.h index fa68d2e7..c2689493 100644 --- a/dev/kernel/KernelKit/DeviceMgr.h +++ b/dev/kernel/KernelKit/DeviceMgr.h @@ -24,11 +24,11 @@ #define kDeviceMgrRootDirPath "/Devices/" -#define NE_DEVICE : public ::NeOS::IDeviceObject +#define NE_DEVICE : public ::Kernel::IDeviceObject // Last Rev: Wed, Apr 3, 2024 9:09:41 AM -namespace NeOS +namespace Kernel { template <typename T> class IDeviceObject; @@ -137,4 +137,4 @@ namespace NeOS kDeviceTypeMediaCtrl, // MM controller kDeviceTypeCount, }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/DriveMgr.h b/dev/kernel/KernelKit/DriveMgr.h index fd972ab7..9d461703 100644 --- a/dev/kernel/KernelKit/DriveMgr.h +++ b/dev/kernel/KernelKit/DriveMgr.h @@ -23,7 +23,7 @@ #define drv_sector_cnt(SIZE, SECTOR_SZ) (((SIZE) + (SECTOR_SZ)) / (SECTOR_SZ)) -namespace NeOS +namespace Kernel { enum { @@ -186,6 +186,6 @@ namespace NeOS /// @param DrvIndex drive index. /// @return Int32 fs_ifs_write(MountpointInterface* Mnt, DriveTrait& DrvTrait, Int32 DrvIndex); -} // namespace NeOS +} // namespace Kernel #endif /* ifndef INC_DRIVE_MANAGER_H */ diff --git a/dev/kernel/KernelKit/FileMgr.h b/dev/kernel/KernelKit/FileMgr.h index 61bb6440..68036aad 100644 --- a/dev/kernel/KernelKit/FileMgr.h +++ b/dev/kernel/KernelKit/FileMgr.h @@ -49,7 +49,7 @@ #define kRestrictMax (5U) -#define node_cast(PTR) reinterpret_cast<NeOS::NodePtr>(PTR) +#define node_cast(PTR) reinterpret_cast<Kernel::NodePtr>(PTR) /** @note Refer to first enum. @@ -60,7 +60,7 @@ /** @brief invalid position. (n-pos) */ #define kNPos (SizeT)(-1); -namespace NeOS +namespace Kernel { enum { @@ -387,6 +387,6 @@ namespace NeOS { mm_delete_heap(fFile); } -} // namespace NeOS +} // namespace Kernel #endif // ifndef INC_FILEMGR_H diff --git a/dev/kernel/KernelKit/HardwareThreadScheduler.h b/dev/kernel/KernelKit/HardwareThreadScheduler.h index 1866686e..6ee55226 100644 --- a/dev/kernel/KernelKit/HardwareThreadScheduler.h +++ b/dev/kernel/KernelKit/HardwareThreadScheduler.h @@ -16,7 +16,7 @@ #define kMaxAPInsideSched (8U) -namespace NeOS +namespace Kernel { class HardwareThread; class HardwareThreadScheduler; @@ -144,6 +144,6 @@ namespace NeOS /// @brief makes thread sleep. /// hooks and hangs thread to prevent code from executing. Void mp_hang_thread(HAL::StackFramePtr stack); -} // namespace NeOS +} // namespace Kernel #endif // !__INC_MP_MANAGER_H__ diff --git a/dev/kernel/KernelKit/IDylibObject.h b/dev/kernel/KernelKit/IDylibObject.h index c872b86f..f02fb9d3 100644 --- a/dev/kernel/KernelKit/IDylibObject.h +++ b/dev/kernel/KernelKit/IDylibObject.h @@ -14,7 +14,7 @@ #define NE_DYLIB_OBJECT : public IDylibObject -namespace NeOS +namespace Kernel { /// @brief DLL class object. A handle to a shared library. class IDylibObject @@ -45,4 +45,4 @@ namespace NeOS /// @brief Pure implementation, missing method/function handler. EXTERN_C void __zka_pure_call(void); -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/IPEFDylibObject.h b/dev/kernel/KernelKit/IPEFDylibObject.h index 20f87410..22360e50 100644 --- a/dev/kernel/KernelKit/IPEFDylibObject.h +++ b/dev/kernel/KernelKit/IPEFDylibObject.h @@ -16,7 +16,7 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/IDylibObject.h> -namespace NeOS +namespace Kernel { /** * @brief Shared Library class @@ -101,6 +101,6 @@ namespace NeOS EXTERN_C IDylibRef rtl_init_dylib(UserProcess& header); EXTERN_C Void rtl_fini_dylib(UserProcess& header, IDylibRef lib, Bool* successful); -} // namespace NeOS +} // namespace Kernel #endif /* ifndef __KERNELKIT_SHARED_OBJECT_H__ */ diff --git a/dev/kernel/KernelKit/KPC.h b/dev/kernel/KernelKit/KPC.h index 9b62c14e..c6724282 100644 --- a/dev/kernel/KernelKit/KPC.h +++ b/dev/kernel/KernelKit/KPC.h @@ -11,15 +11,15 @@ /// @file KPC.h /// @brief Kernel Procedure Code. -#define err_local_ok() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == NeOS::kErrorSuccess) -#define err_local_fail() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() != NeOS::kErrorSuccess) -#define err_local_get() (NeOS::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode()) +#define err_local_ok() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() == Kernel::kErrorSuccess) +#define err_local_fail() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode() != Kernel::kErrorSuccess) +#define err_local_get() (Kernel::UserProcessScheduler::The().CurrentProcess().Leak().GetLocalCode()) -#define err_global_ok() (NeOS::kErrorLocalNumber == NeOS::kErrorSuccess) -#define err_global_fail() (NeOS::kErrorLocalNumber != NeOS::kErrorSuccess) -#define err_global_get() (NeOS::kErrorLocalNumber) +#define err_global_ok() (Kernel::kErrorLocalNumber == Kernel::kErrorSuccess) +#define err_global_fail() (Kernel::kErrorLocalNumber != Kernel::kErrorSuccess) +#define err_global_get() (Kernel::kErrorLocalNumber) -namespace NeOS +namespace Kernel { typedef Int32 HError; @@ -64,4 +64,4 @@ namespace NeOS /// @param void no params are needed. /// @return if error-free: false, otherwise true. Boolean err_bug_check_raise(Void) noexcept; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/LoaderInterface.h b/dev/kernel/KernelKit/LoaderInterface.h index 99291c04..cb833732 100644 --- a/dev/kernel/KernelKit/LoaderInterface.h +++ b/dev/kernel/KernelKit/LoaderInterface.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/ErrorOr.h> -namespace NeOS +namespace Kernel { /// @brief This interface is used to make loader contracts (MSCOFF, PEF). /// @author @Amlal-El-Mahrouss @@ -31,4 +31,4 @@ namespace NeOS virtual _Output ErrorOr<VoidPtr> FindStart() = 0; virtual _Output VoidPtr FindSymbol(_Input const Char* name, _Input Int32 kind) = 0; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/LockDelegate.h b/dev/kernel/KernelKit/LockDelegate.h index 28eff060..5143cf2b 100644 --- a/dev/kernel/KernelKit/LockDelegate.h +++ b/dev/kernel/KernelKit/LockDelegate.h @@ -9,7 +9,7 @@ #include <NewKit/Atom.h> #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { enum { @@ -68,4 +68,4 @@ namespace NeOS private: Atom<UInt> fLockStatus; }; -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/MBCI/.keep b/dev/kernel/KernelKit/MBCI/.keep deleted file mode 100644 index e69de29b..00000000 --- a/dev/kernel/KernelKit/MBCI/.keep +++ /dev/null diff --git a/dev/kernel/KernelKit/MSDOS.h b/dev/kernel/KernelKit/MSDOS.h index 1a3df13b..8d18b884 100644 --- a/dev/kernel/KernelKit/MSDOS.h +++ b/dev/kernel/KernelKit/MSDOS.h @@ -23,12 +23,12 @@ #define kMagMz0 'M' #define kMagMz1 'Z' -typedef NeOS::UInt32 DosWord; -typedef NeOS::Long DosLong; +typedef Kernel::UInt32 DosWord; +typedef Kernel::Long DosLong; typedef struct _DosHeader { - NeOS::UInt8 eMagic[2]; + Kernel::UInt8 eMagic[2]; DosWord eMagLen; DosWord ePagesCount; DosWord eCrlc; diff --git a/dev/kernel/KernelKit/MemoryMgr.h b/dev/kernel/KernelKit/MemoryMgr.h index e2b8aa2f..229b6aa6 100644 --- a/dev/kernel/KernelKit/MemoryMgr.h +++ b/dev/kernel/KernelKit/MemoryMgr.h @@ -9,13 +9,13 @@ /// @date 30/01/24 /// @file: MemoryMgr.h -/// @brief: heap allocation support. +/// @brief: Memory allocation support for the NeKernel. #include <NewKit/KernelPanic.h> #include <KernelKit/KPC.h> #include <hint/CompilerHint.h> -namespace NeOS +namespace Kernel { /// @brief Declare pointer as free. /// @param heap_ptr the pointer. @@ -66,7 +66,7 @@ namespace NeOS { if (*cls) { - err_global_get() = NeOS::kErrorInvalidData; + err_global_get() = Kernel::kErrorInvalidData; return NO; } @@ -82,6 +82,6 @@ namespace NeOS delete *cls; *cls = nullptr; } -} // namespace NeOS +} // namespace Kernel #endif // !INC_KERNEL_HEAP_H diff --git a/dev/kernel/KernelKit/PCI/DMA.h b/dev/kernel/KernelKit/PCI/DMA.h index 68f3fa37..fc49dd4f 100644 --- a/dev/kernel/KernelKit/PCI/DMA.h +++ b/dev/kernel/KernelKit/PCI/DMA.h @@ -12,7 +12,7 @@ #include <NewKit/OwnPtr.h> #include <NewKit/Ref.h> -namespace NeOS +namespace Kernel { enum class DmaKind { @@ -76,6 +76,6 @@ namespace NeOS public: static OwnPtr<IOBuf<Char*>> Construct(OwnPtr<DMAWrapper>& dma); }; -} // namespace NeOS +} // namespace Kernel #include <KernelKit/PCI/DMA.inl> diff --git a/dev/kernel/KernelKit/PCI/DMA.inl b/dev/kernel/KernelKit/PCI/DMA.inl index d9c6e551..f3fb0f8c 100644 --- a/dev/kernel/KernelKit/PCI/DMA.inl +++ b/dev/kernel/KernelKit/PCI/DMA.inl @@ -4,7 +4,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { template <class T> T* DMAWrapper::operator->() @@ -17,4 +17,4 @@ namespace NeOS { return reinterpret_cast<T*>((UIntPtr)this->fAddress + offset); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/PCI/Database.h b/dev/kernel/KernelKit/PCI/Database.h index cb12a731..82084bb1 100644 --- a/dev/kernel/KernelKit/PCI/Database.h +++ b/dev/kernel/KernelKit/PCI/Database.h @@ -8,7 +8,7 @@ #include <KernelKit/PCI/Device.h> #include <NewKit/Defines.h> -namespace NeOS +namespace Kernel { namespace Types { @@ -35,24 +35,24 @@ namespace NeOS Invalid = Unassgined, }; } // namespace Types -} // namespace NeOS +} // namespace Kernel -inline BOOL operator!=(const NeOS::Types::PciDeviceKind& lhs, NeOS::UChar rhs) +inline BOOL operator!=(const Kernel::Types::PciDeviceKind& lhs, Kernel::UChar rhs) { - return rhs != (NeOS::UChar)lhs; + return rhs != (Kernel::UChar)lhs; } -inline BOOL operator==(const NeOS::Types::PciDeviceKind& lhs, NeOS::UChar rhs) +inline BOOL operator==(const Kernel::Types::PciDeviceKind& lhs, Kernel::UChar rhs) { - return rhs == (NeOS::UChar)lhs; + return rhs == (Kernel::UChar)lhs; } -inline BOOL operator!=(NeOS::UChar lhs, const NeOS::Types::PciDeviceKind& rhs) +inline BOOL operator!=(Kernel::UChar lhs, const Kernel::Types::PciDeviceKind& rhs) { - return lhs != (NeOS::UChar)rhs; + return lhs != (Kernel::UChar)rhs; } -inline BOOL operator==(NeOS::UChar lhs, const NeOS::Types::PciDeviceKind& rhs) +inline BOOL operator==(Kernel::UChar lhs, const Kernel::Types::PciDeviceKind& rhs) { - return lhs == (NeOS::UChar)rhs; + return lhs == (Kernel::UChar)rhs; }
\ No newline at end of file diff --git a/dev/kernel/KernelKit/PCI/Device.h b/dev/kernel/KernelKit/PCI/Device.h index 9870f618..cb463485 100644 --- a/dev/kernel/KernelKit/PCI/Device.h +++ b/dev/kernel/KernelKit/PCI/Device.h @@ -7,7 +7,7 @@ #include <NewKit/Defines.h> -namespace NeOS::PCI +namespace Kernel::PCI { enum class PciConfigKind : UShort { @@ -75,7 +75,7 @@ namespace NeOS::PCI UShort fFunction; UInt32 fBar; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI -EXTERN_C void NewOSPCISetCfgTarget(NeOS::UInt bar); -EXTERN_C NeOS::UInt NewOSPCIReadRaw(NeOS::UInt bar); +EXTERN_C void NewOSPCISetCfgTarget(Kernel::UInt bar); +EXTERN_C Kernel::UInt NewOSPCIReadRaw(Kernel::UInt bar); diff --git a/dev/kernel/KernelKit/PCI/IO.h b/dev/kernel/KernelKit/PCI/IO.h index 1d60df8e..1de30b63 100644 --- a/dev/kernel/KernelKit/PCI/IO.h +++ b/dev/kernel/KernelKit/PCI/IO.h @@ -11,7 +11,7 @@ #include <NewKit/Defines.h> #include <NewKit/Ref.h> -namespace NeOS +namespace Kernel { template <SizeT Sz> class IOArray final @@ -66,7 +66,7 @@ namespace NeOS return ports; } -} // namespace NeOS +} // namespace Kernel #ifdef __x86_64__ #include <KernelKit/PCI/IOArray+AMD64.inl> diff --git a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl index 2630fa98..223546c5 100644 --- a/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl +++ b/dev/kernel/KernelKit/PCI/IOArray+AMD64.inl @@ -12,7 +12,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { template <SizeT Sz> template <typename T> @@ -51,4 +51,4 @@ namespace NeOS break; } } -} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/KernelKit/PCI/Iterator.h b/dev/kernel/KernelKit/PCI/Iterator.h index 2a788450..c364e1f7 100644 --- a/dev/kernel/KernelKit/PCI/Iterator.h +++ b/dev/kernel/KernelKit/PCI/Iterator.h @@ -17,7 +17,7 @@ #define NE_DEVICE_COUNT (33) #define NE_FUNCTION_COUNT (8) -namespace NeOS::PCI +namespace Kernel::PCI { class Iterator final { @@ -38,6 +38,6 @@ namespace NeOS::PCI private: Array<PCI::Device, NE_BUS_COUNT> fDevices; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI #endif // __PCI_ITERATOR_H__ diff --git a/dev/kernel/KernelKit/PCI/PCI.h b/dev/kernel/KernelKit/PCI/PCI.h index 7eec9ec1..11bc7b94 100644 --- a/dev/kernel/KernelKit/PCI/PCI.h +++ b/dev/kernel/KernelKit/PCI/PCI.h @@ -15,7 +15,7 @@ #define kPCIFuncCount (8) #define kPCIBusCount (256U) -namespace NeOS::PCI +namespace Kernel::PCI { // model struct DeviceHeader @@ -56,4 +56,4 @@ namespace NeOS::PCI Detail::BAR BAR4; Detail::BAR BAR5; }; -} // namespace NeOS::PCI +} // namespace Kernel::PCI diff --git a/dev/kernel/KernelKit/PE.h b/dev/kernel/KernelKit/PE.h index dbcf2ded..3746cf90 100644 --- a/dev/kernel/KernelKit/PE.h +++ b/dev/kernel/KernelKit/PE.h @@ -29,62 +29,62 @@ typedef struct LDR_EXEC_HEADER final { - NeOS::UInt32 Signature; - NeOS::UInt16 Machine; - NeOS::UInt16 NumberOfSections; - NeOS::UInt32 TimeDateStamp; - NeOS::UInt32 PointerToSymbolTable; - NeOS::UInt32 NumberOfSymbols; - NeOS::UInt16 SizeOfOptionalHeader; - NeOS::UInt16 Characteristics; + Kernel::UInt32 Signature; + Kernel::UInt16 Machine; + Kernel::UInt16 NumberOfSections; + Kernel::UInt32 TimeDateStamp; + Kernel::UInt32 PointerToSymbolTable; + Kernel::UInt32 NumberOfSymbols; + Kernel::UInt16 SizeOfOptionalHeader; + Kernel::UInt16 Characteristics; } LDR_EXEC_HEADER, *LDR_EXEC_HEADER_PTR; typedef struct LDR_OPTIONAL_HEADER final { - NeOS::UInt16 Magic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - NeOS::UInt8 MajorLinkerVersion; - NeOS::UInt8 MinorLinkerVersion; - NeOS::UInt32 SizeOfCode; - NeOS::UInt32 SizeOfInitializedData; - NeOS::UInt32 SizeOfUninitializedData; - NeOS::UInt32 AddressOfEntryPoint; - NeOS::UInt32 BaseOfCode; - NeOS::UInt32 BaseOfData; - NeOS::UInt32 ImageBase; - NeOS::UInt32 SectionAlignment; - NeOS::UInt32 FileAlignment; - NeOS::UInt16 MajorOperatingSystemVersion; - NeOS::UInt16 MinorOperatingSystemVersion; - NeOS::UInt16 MajorImageVersion; - NeOS::UInt16 MinorImageVersion; - NeOS::UInt16 MajorSubsystemVersion; - NeOS::UInt16 MinorSubsystemVersion; - NeOS::UInt32 Win32VersionValue; - NeOS::UInt32 SizeOfImage; - NeOS::UInt32 SizeOfHeaders; - NeOS::UInt32 CheckSum; - NeOS::UInt16 Subsystem; - NeOS::UInt16 DllCharacteristics; - NeOS::UInt32 SizeOfStackReserve; - NeOS::UInt32 SizeOfStackCommit; - NeOS::UInt32 SizeOfHeapReserve; - NeOS::UInt32 SizeOfHeapCommit; - NeOS::UInt32 LoaderFlags; - NeOS::UInt32 NumberOfRvaAndSizes; + Kernel::UInt16 Magic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) + Kernel::UInt8 MajorLinkerVersion; + Kernel::UInt8 MinorLinkerVersion; + Kernel::UInt32 SizeOfCode; + Kernel::UInt32 SizeOfInitializedData; + Kernel::UInt32 SizeOfUninitializedData; + Kernel::UInt32 AddressOfEntryPoint; + Kernel::UInt32 BaseOfCode; + Kernel::UInt32 BaseOfData; + Kernel::UInt32 ImageBase; + Kernel::UInt32 SectionAlignment; + Kernel::UInt32 FileAlignment; + Kernel::UInt16 MajorOperatingSystemVersion; + Kernel::UInt16 MinorOperatingSystemVersion; + Kernel::UInt16 MajorImageVersion; + Kernel::UInt16 MinorImageVersion; + Kernel::UInt16 MajorSubsystemVersion; + Kernel::UInt16 MinorSubsystemVersion; + Kernel::UInt32 Win32VersionValue; + Kernel::UInt32 SizeOfImage; + Kernel::UInt32 SizeOfHeaders; + Kernel::UInt32 CheckSum; + Kernel::UInt16 Subsystem; + Kernel::UInt16 DllCharacteristics; + Kernel::UInt32 SizeOfStackReserve; + Kernel::UInt32 SizeOfStackCommit; + Kernel::UInt32 SizeOfHeapReserve; + Kernel::UInt32 SizeOfHeapCommit; + Kernel::UInt32 LoaderFlags; + Kernel::UInt32 NumberOfRvaAndSizes; } LDR_OPTIONAL_HEADER, *LDR_OPTIONAL_HEADER_PTR; typedef struct LDR_SECTION_HEADER final { - NeOS::Char Name[8]; - NeOS::UInt32 VirtualSize; - NeOS::UInt32 VirtualAddress; - NeOS::UInt32 SizeOfRawData; - NeOS::UInt32 PointerToRawData; - NeOS::UInt32 PointerToRelocations; - NeOS::UInt32 PointerToLineNumbers; - NeOS::UInt16 NumberOfRelocations; - NeOS::UInt16 NumberOfLinenumbers; - NeOS::UInt32 Characteristics; + Kernel::Char Name[8]; + Kernel::UInt32 VirtualSize; + Kernel::UInt32 VirtualAddress; + Kernel::UInt32 SizeOfRawData; + Kernel::UInt32 PointerToRawData; + Kernel::UInt32 PointerToRelocations; + Kernel::UInt32 PointerToLineNumbers; + Kernel::UInt16 NumberOfRelocations; + Kernel::UInt16 NumberOfLinenumbers; + Kernel::UInt32 Characteristics; } LDR_SECTION_HEADER, *LDR_SECTION_HEADER_PTR; enum kExecDataDirParams @@ -97,35 +97,35 @@ enum kExecDataDirParams typedef struct LDR_EXPORT_DIRECTORY { - NeOS::UInt32 Characteristics; - NeOS::UInt32 TimeDateStamp; - NeOS::UInt16 MajorVersion; - NeOS::UInt16 MinorVersion; - NeOS::UInt32 Name; - NeOS::UInt32 Base; - NeOS::UInt32 NumberOfFunctions; - NeOS::UInt32 NumberOfNames; - NeOS::UInt32 AddressOfFunctions; // export table rva - NeOS::UInt32 AddressOfNames; - NeOS::UInt32 AddressOfNameOrdinal; // ordinal table rva + Kernel::UInt32 Characteristics; + Kernel::UInt32 TimeDateStamp; + Kernel::UInt16 MajorVersion; + Kernel::UInt16 MinorVersion; + Kernel::UInt32 Name; + Kernel::UInt32 Base; + Kernel::UInt32 NumberOfFunctions; + Kernel::UInt32 NumberOfNames; + Kernel::UInt32 AddressOfFunctions; // export table rva + Kernel::UInt32 AddressOfNames; + Kernel::UInt32 AddressOfNameOrdinal; // ordinal table rva } LDR_EXPORT_DIRECTORY, *LDR_EXPORT_DIRECTORY_PTR; typedef struct LDR_IMPORT_DIRECTORY { union { - NeOS::UInt32 Characteristics; - NeOS::UInt32 OriginalFirstThunk; + Kernel::UInt32 Characteristics; + Kernel::UInt32 OriginalFirstThunk; }; - NeOS::UInt32 TimeDateStamp; - NeOS::UInt32 ForwarderChain; - NeOS::UInt32 NameRva; - NeOS::UInt32 ThunkTableRva; + Kernel::UInt32 TimeDateStamp; + Kernel::UInt32 ForwarderChain; + Kernel::UInt32 NameRva; + Kernel::UInt32 ThunkTableRva; } LDR_IMPORT_DIRECTORY, *LDR_IMPORT_DIRECTORY_PTR; typedef struct LDR_DATA_DIRECTORY { - NeOS::UInt32 VirtualAddress; - NeOS::UInt32 Size; + Kernel::UInt32 VirtualAddress; + Kernel::UInt32 Size; } LDR_DATA_DIRECTORY, *LDR_DATA_DIRECTORY_PTR; typedef struct LDR_IMAGE_HEADER diff --git a/dev/kernel/KernelKit/PEF.h b/dev/kernel/KernelKit/PEF.h index dfdaed12..7b099d04 100644 --- a/dev/kernel/KernelKit/PEF.h +++ b/dev/kernel/KernelKit/PEF.h @@ -44,7 +44,7 @@ #define kPefForkKind kPefMagic #define kPefForkKindFAT kPefMagicFat -namespace NeOS +namespace Kernel { enum { @@ -112,6 +112,6 @@ namespace NeOS kPefZero = 0xE, kPefLinkerID = 0x1, }; -} // namespace NeOS +} // namespace Kernel #endif /* ifndef KERNELKIT_PEF_H */ diff --git a/dev/kernel/KernelKit/PEFCodeMgr.h b/dev/kernel/KernelKit/PEFCodeMgr.h index 47aea432..aa82f84d 100644 --- a/dev/kernel/KernelKit/PEFCodeMgr.h +++ b/dev/kernel/KernelKit/PEFCodeMgr.h @@ -18,7 +18,7 @@ #define kPefApplicationMime "application/vnd-zka-executable" -namespace NeOS +namespace Kernel { /// /// \name PEFLoader @@ -67,6 +67,6 @@ namespace NeOS { ProcessID rtl_create_process(PEFLoader& exec, const Int32& procKind) noexcept; } // namespace Utils -} // namespace NeOS +} // namespace Kernel #endif // ifndef _INC_CODE_MANAGER_PEF_H_ diff --git a/dev/kernel/KernelKit/Semaphore.h b/dev/kernel/KernelKit/Semaphore.h index ac810c62..dffa1747 100644 --- a/dev/kernel/KernelKit/Semaphore.h +++ b/dev/kernel/KernelKit/Semaphore.h @@ -10,7 +10,7 @@ #include <KernelKit/Timer.h> #include <CompilerKit/CompilerKit.h> -namespace NeOS +namespace Kernel { typedef Int64 Semaphore; -} // namespace NeOS
\ No newline at end of file +} // namespace Kernel
\ No newline at end of file diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.h b/dev/kernel/KernelKit/ThreadLocalStorage.h index 573b40b8..98747ca7 100644 --- a/dev/kernel/KernelKit/ThreadLocalStorage.h +++ b/dev/kernel/KernelKit/ThreadLocalStorage.h @@ -28,12 +28,12 @@ struct THREAD_INFORMATION_BLOCK; /// Located in GS on AMD64, other architectures have their own stuff. (64x0, 32x0, ARM64) struct PACKED THREAD_INFORMATION_BLOCK final { - NeOS::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. - NeOS::VoidPtr Record{nullptr}; //! Thread information record. + Kernel::Char Cookie[kTLSCookieLen]{0}; //! Thread magic number. + Kernel::VoidPtr Record{nullptr}; //! Thread information record. }; ///! @brief Cookie Sanity check. -NeOS::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); +Kernel::Boolean tls_check_tib(THREAD_INFORMATION_BLOCK* the_tib); ///! @brief new ptr syscall. template <typename T> @@ -41,26 +41,26 @@ T* tls_new_ptr(void) noexcept; ///! @brief delete ptr syscall. template <typename T> -NeOS::Boolean tls_delete_ptr(T* ptr) noexcept; +Kernel::Boolean tls_delete_ptr(T* ptr) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept; +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept; //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept; +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept; template <typename T, typename... Args> T* tls_new_class(Args&&... args); /// @brief TLS install TIB and PIB. (syscall) -EXTERN_C NeOS::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); +EXTERN_C Kernel::Void rt_install_tib(THREAD_INFORMATION_BLOCK* TIB, THREAD_INFORMATION_BLOCK* PIB); /// @brief TLS check (syscall) -EXTERN_C NeOS::Bool tls_check_syscall_impl(NeOS::VoidPtr TIB) noexcept; +EXTERN_C Kernel::Bool tls_check_syscall_impl(Kernel::VoidPtr TIB) noexcept; #include <KernelKit/ThreadLocalStorage.inl> diff --git a/dev/kernel/KernelKit/ThreadLocalStorage.inl b/dev/kernel/KernelKit/ThreadLocalStorage.inl index d912f5aa..0517dada 100644 --- a/dev/kernel/KernelKit/ThreadLocalStorage.inl +++ b/dev/kernel/KernelKit/ThreadLocalStorage.inl @@ -14,7 +14,7 @@ template <typename T> inline T* tls_new_ptr(void) noexcept { - using namespace NeOS; + using namespace Kernel; auto ref_process = UserProcessScheduler::The().CurrentProcess(); MUST_PASS(ref_process); @@ -30,9 +30,9 @@ inline T* tls_new_ptr(void) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(T* obj) noexcept +inline Kernel::Bool tls_delete_ptr(T* obj) noexcept { - using namespace NeOS; + using namespace Kernel; if (!obj) return No; @@ -48,7 +48,7 @@ inline NeOS::Bool tls_delete_ptr(T* obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T> obj) noexcept { return tls_delete_ptr(obj.Leak()); } @@ -56,7 +56,7 @@ inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T> obj) noexcept //! @brief Delete process pointer. //! @param obj The pointer to delete. template <typename T> -inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept +inline Kernel::Bool tls_delete_ptr(Kernel::ErrorOr<T*> obj) noexcept { return tls_delete_ptr(obj->Leak()); } @@ -69,7 +69,7 @@ inline NeOS::Bool tls_delete_ptr(NeOS::ErrorOr<T*> obj) noexcept template <typename T, typename... Args> T* tls_new_class(Args&&... args) { - using namespace NeOS; + using namespace Kernel; T* obj = tls_new_ptr<T>(); @@ -87,9 +87,9 @@ T* tls_new_class(Args&&... args) /// @param obj /// @return template <typename T> -inline NeOS::Bool tls_delete_class(T* obj) +inline Kernel::Bool tls_delete_class(T* obj) { - using namespace NeOS; + using namespace Kernel; if (!obj) return No; diff --git a/dev/kernel/KernelKit/Timer.h b/dev/kernel/KernelKit/Timer.h index e52f91e7..1e96f263 100644 --- a/dev/kernel/KernelKit/Timer.h +++ b/dev/kernel/KernelKit/Timer.h @@ -9,7 +9,7 @@ #include <ArchKit/ArchKit.h> #include <KernelKit/KPC.h> -namespace NeOS +namespace Kernel { class SoftwareTimer; class TimerInterface; @@ -80,4 +80,4 @@ namespace NeOS return kTimeUnit * rtl_ms(time); } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/User.h b/dev/kernel/KernelKit/User.h index 620b9bc9..3127f785 100644 --- a/dev/kernel/KernelKit/User.h +++ b/dev/kernel/KernelKit/User.h @@ -31,7 +31,7 @@ #define kMaxUserNameLen (256U) #define kMaxUserTokenLen (256U) -namespace NeOS +namespace Kernel { class User; @@ -90,6 +90,6 @@ namespace NeOS Char mUserName[kMaxUserNameLen] = {0}; Char mUserKey[kMaxUserTokenLen] = {0}; }; -} // namespace NeOS +} // namespace Kernel #endif /* ifndef INC_USER_H */ diff --git a/dev/kernel/KernelKit/UserProcessScheduler.h b/dev/kernel/KernelKit/UserProcessScheduler.h index a2006db1..dc90dc96 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.h +++ b/dev/kernel/KernelKit/UserProcessScheduler.h @@ -13,22 +13,21 @@ #include <NewKit/MutableArray.h> #define kSchedMinMicroTime (AffinityKind::kStandard) -#define kSchedInvalidPID (-1) +#define kSchedInvalidPID ((PID)~0) #define kSchedProcessLimitPerTeam (32U) #define kSchedMaxMemoryLimit gib_cast(128) /* max physical memory limit */ #define kSchedMaxStackSz mib_cast(8) /* maximum stack size */ -#define kProcessInvalidID (-1) -#define kProcessNameLen (128U) +#define kSchedNameLen (128U) //////////////////////////////////////////////////// -// The current date is: Thu 11/28/2024 // +// Last revision date is: Fri Mar 28 2025 // //////////////////////////////////////////////////// -namespace NeOS +namespace Kernel { - //! @note Forward class declarations. + //! @note Forward class declaration. class IDylibObject; class UserProcess; @@ -121,7 +120,7 @@ namespace NeOS }; using ProcessTime = UInt64; - using PID = Int64; + using PID = UInt64; /***********************************************************************************/ /// @note For User manager, tells where we run the code. @@ -171,7 +170,7 @@ namespace NeOS NE_COPY_DEFAULT(UserProcess); public: - Char Name[kProcessNameLen] = {"Process"}; + Char Name[kSchedNameLen] = {"Process"}; ProcessSubsystem SubSystem{ProcessSubsystem::kProcessSubsystemInvalid}; User* Owner{nullptr}; HAL::StackFramePtr StackFrame{nullptr}; @@ -368,7 +367,7 @@ namespace NeOS }; const UInt32& sched_get_exit_code(void) noexcept; -} // namespace NeOS +} // namespace Kernel #include <KernelKit/ThreadLocalStorage.h> #include <KernelKit/UserProcessScheduler.inl> diff --git a/dev/kernel/KernelKit/UserProcessScheduler.inl b/dev/kernel/KernelKit/UserProcessScheduler.inl index 6b3b9300..4b3d5820 100644 --- a/dev/kernel/KernelKit/UserProcessScheduler.inl +++ b/dev/kernel/KernelKit/UserProcessScheduler.inl @@ -7,7 +7,7 @@ ------------------------------------------- */ -namespace NeOS +namespace Kernel { /***********************************************************************************/ /** @brief Free pointer from usage. */ @@ -59,4 +59,4 @@ namespace NeOS return No; } -} // namespace NeOS +} // namespace Kernel diff --git a/dev/kernel/KernelKit/XCOFF.h b/dev/kernel/KernelKit/XCOFF.h index 5e59e717..037a52bb 100644 --- a/dev/kernel/KernelKit/XCOFF.h +++ b/dev/kernel/KernelKit/XCOFF.h @@ -29,13 +29,13 @@ struct XCoffForkHeader; /// @brief XCoff file header, meant for POWER apps. typedef struct XCoffFileHeader { - NeOS::UInt16 fMagic; - NeOS::UInt16 fTarget; - NeOS::UInt16 fNumSecs; - NeOS::UInt32 fTimeDat; - NeOS::UIntPtr fSymPtr; - NeOS::UInt32 fNumSyms; - NeOS::UInt16 fOptHdr; // ?: Number of bytes in optional header + Kernel::UInt16 fMagic; + Kernel::UInt16 fTarget; + Kernel::UInt16 fNumSecs; + Kernel::UInt32 fTimeDat; + Kernel::UIntPtr fSymPtr; + Kernel::UInt32 fNumSyms; + Kernel::UInt16 fOptHdr; // ?: Number of bytes in optional header } XCoffFileHeader64; #define kForkNameLen (256U) @@ -43,9 +43,9 @@ typedef struct XCoffFileHeader /// @brief This the executable manifest fork. typedef struct XCoffForkHeader { - NeOS::Char fPropertiesXMLFork[kForkNameLen]; - NeOS::Char fDynamicLoaderFork[kForkNameLen]; - NeOS::Char fCodeSignFork[kForkNameLen]; + Kernel::Char fPropertiesXMLFork[kForkNameLen]; + Kernel::Char fDynamicLoaderFork[kForkNameLen]; + Kernel::Char fCodeSignFork[kForkNameLen]; } XCoffForkHeader; #endif // ifndef INC_XOCFF_H |