From 05f085c9055fa5bd13bdba40fc40fb3f00d69fab Mon Sep 17 00:00:00 2001 From: Amlal Date: Sat, 26 Oct 2024 07:59:10 +0200 Subject: IMP: Fixes and improvements. Signed-off-by: Amlal --- dev/zka/CFKit/GUIDWizard.h | 4 +-- dev/zka/CFKit/LoaderUtils.h | 55 -------------------------------- dev/zka/CFKit/Utils.h | 55 ++++++++++++++++++++++++++++++++ dev/zka/HALKit/AMD64/HalCPU.cc | 4 +-- dev/zka/HALKit/AMD64/HalDebugPort.cc | 2 +- dev/zka/HALKit/AMD64/HalPagingMgr.cc | 2 +- dev/zka/HALKit/AMD64/HalTimer.cc | 4 +-- dev/zka/HALKit/AMD64/Storage/AHCI.cc | 2 +- dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc | 2 +- dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc | 2 +- dev/zka/HALKit/ARM64/HalPagingMgr.cc | 2 +- dev/zka/HALKit/ARM64/HalTimer.cc | 2 +- dev/zka/HALKit/ARM64/Storage/HalFlash.cc | 2 +- dev/zka/src/DriveMgr.cc | 2 +- dev/zka/src/ErrorOr.cc | 2 +- dev/zka/src/GUIDWizard.cc | 38 +++++++++++----------- dev/zka/src/HardwareThreadScheduler.cc | 2 +- dev/zka/src/Heap.cc | 2 +- dev/zka/src/IPEFDLLObject.cc | 2 +- dev/zka/src/NeFS+IO.cc | 2 +- dev/zka/src/Stream.cc | 2 +- dev/zka/src/ThreadLocalStorage.cc | 2 +- dev/zka/src/Timer.cc | 2 +- dev/zka/src/User.cc | 2 +- dev/zka/src/UserProcessScheduler.cc | 4 +-- dev/zka/src/UserProcessTeam.cc | 2 +- 26 files changed, 101 insertions(+), 101 deletions(-) delete mode 100644 dev/zka/CFKit/LoaderUtils.h create mode 100644 dev/zka/CFKit/Utils.h (limited to 'dev/zka') diff --git a/dev/zka/CFKit/GUIDWizard.h b/dev/zka/CFKit/GUIDWizard.h index 4a41cf7f..b4a92249 100644 --- a/dev/zka/CFKit/GUIDWizard.h +++ b/dev/zka/CFKit/GUIDWizard.h @@ -19,6 +19,6 @@ namespace CFKit::XRN::Version1 { using namespace Kernel; - Ref cf_make_sequence(const ArrayList& seq); - ErrorOr> cf_try_guid_to_string(Ref& guid); + Ref cf_make_sequence(const ArrayList& seq); + ErrorOr> cf_try_guid_to_string(Ref& guid); } // namespace CFKit::XRN::Version1 diff --git a/dev/zka/CFKit/LoaderUtils.h b/dev/zka/CFKit/LoaderUtils.h deleted file mode 100644 index edaa38d0..00000000 --- a/dev/zka/CFKit/LoaderUtils.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef __CFKIT_LOADER_UTILS_H__ -#define __CFKIT_LOADER_UTILS_H__ - -#include -#include - -namespace CFKit -{ - using namespace Kernel; - - /// @brief Finds the PE header inside the blob. - inline auto ldr_find_exec_header(DosHeaderPtr ptrDos) -> LDR_EXEC_HEADER_PTR - { - if (!ptrDos) - return nullptr; - - if (ptrDos->eMagic[0] != kMagMz0) - return nullptr; - - if (ptrDos->eMagic[1] != kMagMz1) - return nullptr; - - return (LDR_EXEC_HEADER_PTR)(VoidPtr)(&ptrDos->eLfanew + 1); - } - - /// @brief Finds the PE optional header inside the blob. - inline auto ldr_find_opt_exec_header(DosHeaderPtr ptrDos) -> LDR_OPTIONAL_HEADER_PTR - { - if (!ptrDos) - return nullptr; - - auto exec = ldr_find_exec_header(ptrDos); - - if (!exec) - return nullptr; - - return (LDR_OPTIONAL_HEADER_PTR)(VoidPtr)(&exec->mCharacteristics + 1); - } - - /// @brief Finds the PE header inside the blob. - /// @note overloaded function. - inline auto ldr_find_exec_header(const Char* ptrDos) -> LDR_EXEC_HEADER_PTR - { - return ldr_find_exec_header((DosHeaderPtr)ptrDos); - } - - /// @brief Finds the PE header inside the blob. - /// @note overloaded function. - inline auto ldr_find_opt_exec_header(const Char* ptrDos) -> LDR_OPTIONAL_HEADER_PTR - { - return ldr_find_opt_exec_header((DosHeaderPtr)ptrDos); - } -} // namespace CFKit - -#endif // ifndef __CFKIT_LOADER_UTILS_H__ diff --git a/dev/zka/CFKit/Utils.h b/dev/zka/CFKit/Utils.h new file mode 100644 index 00000000..370eca45 --- /dev/null +++ b/dev/zka/CFKit/Utils.h @@ -0,0 +1,55 @@ +#ifndef CFKIT_UTILS_H +#define CFKIT_UTILS_H + +#include +#include + +namespace CFKit +{ + using namespace Kernel; + + /// @brief Finds the PE header inside the blob. + inline auto ldr_find_exec_header(DosHeaderPtr ptrDos) -> LDR_EXEC_HEADER_PTR + { + if (!ptrDos) + return nullptr; + + if (ptrDos->eMagic[0] != kMagMz0) + return nullptr; + + if (ptrDos->eMagic[1] != kMagMz1) + return nullptr; + + return (LDR_EXEC_HEADER_PTR)(VoidPtr)(&ptrDos->eLfanew + 1); + } + + /// @brief Finds the PE optional header inside the blob. + inline auto ldr_find_opt_exec_header(DosHeaderPtr ptrDos) -> LDR_OPTIONAL_HEADER_PTR + { + if (!ptrDos) + return nullptr; + + auto exec = ldr_find_exec_header(ptrDos); + + if (!exec) + return nullptr; + + return (LDR_OPTIONAL_HEADER_PTR)(VoidPtr)(&exec->mCharacteristics + 1); + } + + /// @brief Finds the PE header inside the blob. + /// @note overloaded function. + inline auto ldr_find_exec_header(const Char* ptrDos) -> LDR_EXEC_HEADER_PTR + { + return ldr_find_exec_header((DosHeaderPtr)ptrDos); + } + + /// @brief Finds the PE header inside the blob. + /// @note overloaded function. + inline auto ldr_find_opt_exec_header(const Char* ptrDos) -> LDR_OPTIONAL_HEADER_PTR + { + return ldr_find_opt_exec_header((DosHeaderPtr)ptrDos); + } +} // namespace CFKit + +#endif // ifndef CFKIT_UTILS_H diff --git a/dev/zka/HALKit/AMD64/HalCPU.cc b/dev/zka/HALKit/AMD64/HalCPU.cc index 80729346..d24bfc0a 100644 --- a/dev/zka/HALKit/AMD64/HalCPU.cc +++ b/dev/zka/HALKit/AMD64/HalCPU.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: HalCPU.cxx + File: HalCPU.cc Purpose: Platform processor routines. ------------------------------------------- */ @@ -11,7 +11,7 @@ #include /** - * @file HalCPU.cxx + * @file HalCPU.cc * @brief Common CPU API. */ diff --git a/dev/zka/HALKit/AMD64/HalDebugPort.cc b/dev/zka/HALKit/AMD64/HalDebugPort.cc index 6c8ebf2b..c6acfac6 100644 --- a/dev/zka/HALKit/AMD64/HalDebugPort.cc +++ b/dev/zka/HALKit/AMD64/HalDebugPort.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -//! @file DebuggerPort.cxx +//! @file DebuggerPort.cc //! @brief UART debug via packets. #include diff --git a/dev/zka/HALKit/AMD64/HalPagingMgr.cc b/dev/zka/HALKit/AMD64/HalPagingMgr.cc index afc86eeb..1a7202d7 100644 --- a/dev/zka/HALKit/AMD64/HalPagingMgr.cc +++ b/dev/zka/HALKit/AMD64/HalPagingMgr.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: HalPagingMgr.cxx + File: HalPagingMgr.cc Purpose: Platform Paging Manager.. ------------------------------------------- */ diff --git a/dev/zka/HALKit/AMD64/HalTimer.cc b/dev/zka/HALKit/AMD64/HalTimer.cc index 6d552a09..c7f6bea3 100644 --- a/dev/zka/HALKit/AMD64/HalTimer.cc +++ b/dev/zka/HALKit/AMD64/HalTimer.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: HalTimer.cxx + File: HalTimer.cc Purpose: HAL timer Revision History: @@ -23,7 +23,7 @@ #define cHPETInterruptRegValue (0x2C) ///! BUGS: 0 -///! @file HalTimer.cxx +///! @file HalTimer.cc ///! @brief Hardware Timer (HPET) namespace Kernel::Detail diff --git a/dev/zka/HALKit/AMD64/Storage/AHCI.cc b/dev/zka/HALKit/AMD64/Storage/AHCI.cc index 1d237465..1a9b640f 100644 --- a/dev/zka/HALKit/AMD64/Storage/AHCI.cc +++ b/dev/zka/HALKit/AMD64/Storage/AHCI.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file AHCI.cxx + * @file AHCI.cc * @author Amlal El Mahrouss (amlalelmahrouss@icloud.com) * @brief AHCI driver. * @version 0.1 diff --git a/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc b/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc index ddf08501..841960e1 100644 --- a/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc +++ b/dev/zka/HALKit/AMD64/Storage/ATA-DMA.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file ATA-DMA.cxx + * @file ATA-DMA.cc * @author Amlal El Mahrouss (amlalelmahrouss@icloud.com) * @brief ATA driver (DMA mode). * @version 0.1 diff --git a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc index f3907fa3..eaefbd58 100644 --- a/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc +++ b/dev/zka/HALKit/AMD64/Storage/ATA-PIO.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /** - * @file ATA-PIO.cxx + * @file ATA-PIO.cc * @author Amlal El Mahrouss (amlalelmahrouss@icloud.com) * @brief ATA driver (PIO mode). * @version 0.1 diff --git a/dev/zka/HALKit/ARM64/HalPagingMgr.cc b/dev/zka/HALKit/ARM64/HalPagingMgr.cc index 0182c315..52dd738b 100644 --- a/dev/zka/HALKit/ARM64/HalPagingMgr.cc +++ b/dev/zka/HALKit/ARM64/HalPagingMgr.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: HalPagingMgr.cxx + File: HalPagingMgr.cc Purpose: Platform Paging Manager.. ------------------------------------------- */ diff --git a/dev/zka/HALKit/ARM64/HalTimer.cc b/dev/zka/HALKit/ARM64/HalTimer.cc index d3f8c457..18b15bf3 100644 --- a/dev/zka/HALKit/ARM64/HalTimer.cc +++ b/dev/zka/HALKit/ARM64/HalTimer.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: HalTimer.cxx + File: HalTimer.cc Purpose: HAL timer Revision History: diff --git a/dev/zka/HALKit/ARM64/Storage/HalFlash.cc b/dev/zka/HALKit/ARM64/Storage/HalFlash.cc index d64d9d82..24999070 100644 --- a/dev/zka/HALKit/ARM64/Storage/HalFlash.cc +++ b/dev/zka/HALKit/ARM64/Storage/HalFlash.cc @@ -7,7 +7,7 @@ #include #include -/// @file Flash.cxx +/// @file Flash.cc /// @brief Flash memory builtin. #ifdef __USE_MBCI_FLASH__ diff --git a/dev/zka/src/DriveMgr.cc b/dev/zka/src/DriveMgr.cc index 16e3c12d..e2011785 100644 --- a/dev/zka/src/DriveMgr.cc +++ b/dev/zka/src/DriveMgr.cc @@ -13,7 +13,7 @@ #include /***********************************************************************************/ -/// @file DriveMgr.cxx +/// @file DriveMgr.cc /// @brief Drive Manager API. /***********************************************************************************/ diff --git a/dev/zka/src/ErrorOr.cc b/dev/zka/src/ErrorOr.cc index 9c10745e..b6b3aca4 100644 --- a/dev/zka/src/ErrorOr.cc +++ b/dev/zka/src/ErrorOr.cc @@ -7,6 +7,6 @@ #include /***********************************************************************************/ -/// @file ErrorOr.cxx /// +/// @file ErrorOr.cc /// /// @brief ErrorOr container class. /// /***********************************************************************************/ diff --git a/dev/zka/src/GUIDWizard.cc b/dev/zka/src/GUIDWizard.cc index a904696f..d72c77eb 100644 --- a/dev/zka/src/GUIDWizard.cc +++ b/dev/zka/src/GUIDWizard.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: GUIDWizard.cxx + File: GUIDWizard.cc Purpose: GUID helper code Revision History: @@ -13,53 +13,53 @@ #include // begin of ascii 'readable' characters. (A, C, C, 1, 2) -#define kAsciiBegin 47 +#define kUUIDAsciiBegin 47 // @brief Size of UUID. #define kUUIDSize 37 namespace CFKit::XRN::Version1 { - auto cf_make_sequence(const ArrayList& uuidSeq) -> Ref + auto cf_make_sequence(const ArrayList& uuidSeq) -> Ref { GUIDSequence* seq = new GUIDSequence(); MUST_PASS(seq); - Ref seq_ref{*seq}; + Ref seq_ref{seq}; - seq_ref.Leak().fMs1 = uuidSeq[0]; - seq_ref.Leak().fMs2 = uuidSeq[1]; - seq_ref.Leak().fMs3 = uuidSeq[2]; - seq_ref.Leak().fMs4[0] = uuidSeq[3]; - seq_ref.Leak().fMs4[1] = uuidSeq[4]; - seq_ref.Leak().fMs4[2] = uuidSeq[5]; - seq_ref.Leak().fMs4[3] = uuidSeq[6]; - seq_ref.Leak().fMs4[4] = uuidSeq[7]; - seq_ref.Leak().fMs4[5] = uuidSeq[8]; - seq_ref.Leak().fMs4[6] = uuidSeq[9]; - seq_ref.Leak().fMs4[7] = uuidSeq[10]; + seq_ref.Leak()->fMs1 = uuidSeq[0]; + seq_ref.Leak()->fMs2 = uuidSeq[1]; + seq_ref.Leak()->fMs3 = uuidSeq[2]; + seq_ref.Leak()->fMs4[0] = uuidSeq[3]; + seq_ref.Leak()->fMs4[1] = uuidSeq[4]; + seq_ref.Leak()->fMs4[2] = uuidSeq[5]; + seq_ref.Leak()->fMs4[3] = uuidSeq[6]; + seq_ref.Leak()->fMs4[4] = uuidSeq[7]; + seq_ref.Leak()->fMs4[5] = uuidSeq[8]; + seq_ref.Leak()->fMs4[6] = uuidSeq[9]; + seq_ref.Leak()->fMs4[7] = uuidSeq[10]; return seq_ref; } // @brief Tries to make a guid out of a string. // This function is not complete for now - auto cf_try_guid_to_string(Ref& seq) -> ErrorOr> + auto cf_try_guid_to_string(Ref& seq) -> ErrorOr> { Char buf[kUUIDSize]; for (SizeT index = 0; index < 16; ++index) { - buf[index] = seq.Leak().u8[index] + kAsciiBegin; + buf[index] = seq.Leak()->u8[index] + kUUIDAsciiBegin; } for (SizeT index = 16; index < 24; ++index) { - buf[index] = seq.Leak().u16[index] + kAsciiBegin; + buf[index] = seq.Leak()->u16[index] + kUUIDAsciiBegin; } for (SizeT index = 24; index < 28; ++index) { - buf[index] = seq.Leak().u32[index] + kAsciiBegin; + buf[index] = seq.Leak()->u32[index] + kUUIDAsciiBegin; } auto view = StringBuilder::Construct(buf); diff --git a/dev/zka/src/HardwareThreadScheduler.cc b/dev/zka/src/HardwareThreadScheduler.cc index 37d81f04..c1d06531 100644 --- a/dev/zka/src/HardwareThreadScheduler.cc +++ b/dev/zka/src/HardwareThreadScheduler.cc @@ -11,7 +11,7 @@ ///! BUGS: 0 -///! @file MP.cxx +///! @file MP.cc ///! @brief This file handles multi processing in the Kernel. ///! @brief Multi processing is needed for multi-tasking operations. diff --git a/dev/zka/src/Heap.cc b/dev/zka/src/Heap.cc index 45b7aa73..8db31178 100644 --- a/dev/zka/src/Heap.cc +++ b/dev/zka/src/Heap.cc @@ -19,7 +19,7 @@ ------------------------------------------- */ -//! @file Heap.cxx +//! @file Heap.cc //! @brief Kernel's heap manager, serves as the main memory manager. #define kKernelHeapMagic (0xD4D7D5) diff --git a/dev/zka/src/IPEFDLLObject.cc b/dev/zka/src/IPEFDLLObject.cc index d7fe2948..0f0ac483 100644 --- a/dev/zka/src/IPEFDLLObject.cc +++ b/dev/zka/src/IPEFDLLObject.cc @@ -31,7 +31,7 @@ using namespace Kernel; /***********************************************************************************/ -/// @file PEFSharedObjectRT.cxx +/// @file PEFSharedObjectRT.cc /// @brief PEF's shared object runtime. /***********************************************************************************/ diff --git a/dev/zka/src/NeFS+IO.cc b/dev/zka/src/NeFS+IO.cc index 5a5f60c6..b55707f9 100644 --- a/dev/zka/src/NeFS+IO.cc +++ b/dev/zka/src/NeFS+IO.cc @@ -9,7 +9,7 @@ /************************************************************* * - * File: NeFS+IO.cxx + * File: NeFS+IO.cc * Purpose: Filesystem to mountpoint interface. * Date: 3/26/24 * diff --git a/dev/zka/src/Stream.cc b/dev/zka/src/Stream.cc index cf5cb4a4..be1f2308 100644 --- a/dev/zka/src/Stream.cc +++ b/dev/zka/src/Stream.cc @@ -2,7 +2,7 @@ Copyright ZKA Web Services Co. - File: Stream.cxx + File: Stream.cc Purpose: Stream object Revision History: diff --git a/dev/zka/src/ThreadLocalStorage.cc b/dev/zka/src/ThreadLocalStorage.cc index ef8aba6c..8c75d522 100644 --- a/dev/zka/src/ThreadLocalStorage.cc +++ b/dev/zka/src/ThreadLocalStorage.cc @@ -14,7 +14,7 @@ /***********************************************************************************/ /// @bugs: 0 -/// @file ThreadLocalStorage.cxx +/// @file ThreadLocalStorage.cc /// @brief Process Thread Local Storage. /***********************************************************************************/ diff --git a/dev/zka/src/Timer.cc b/dev/zka/src/Timer.cc index e7ad488a..a36ac0c3 100644 --- a/dev/zka/src/Timer.cc +++ b/dev/zka/src/Timer.cc @@ -7,7 +7,7 @@ #include ///! BUGS: 0 -///! @file Timer.cxx +///! @file Timer.cc ///! @brief Software Timer implementation using namespace Kernel; diff --git a/dev/zka/src/User.cc b/dev/zka/src/User.cc index 9037d729..80a14041 100644 --- a/dev/zka/src/User.cc +++ b/dev/zka/src/User.cc @@ -4,7 +4,7 @@ * ZKA * Copyright ZKA Web Services Co., all rights reserved. * - * File: User.cxx + * File: User.cc * Purpose: User class, used to provide authentication and security. * * ======================================================== diff --git a/dev/zka/src/UserProcessScheduler.cc b/dev/zka/src/UserProcessScheduler.cc index 0081367a..05c2b35e 100644 --- a/dev/zka/src/UserProcessScheduler.cc +++ b/dev/zka/src/UserProcessScheduler.cc @@ -2,13 +2,13 @@ Copyright ZKA Web Services Co. - FILE: UserProcessScheduler.cxx + FILE: UserProcessScheduler.cc PURPOSE: EL0/Ring-3 Process scheduler. ------------------------------------------- */ /***********************************************************************************/ -/// @file UserProcessScheduler.cxx +/// @file UserProcessScheduler.cc /// @brief User process scheduler. /***********************************************************************************/ diff --git a/dev/zka/src/UserProcessTeam.cc b/dev/zka/src/UserProcessTeam.cc index 22b158b9..982a9388 100644 --- a/dev/zka/src/UserProcessTeam.cc +++ b/dev/zka/src/UserProcessTeam.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ /***********************************************************************************/ -/// @file UserProcessTeam.cxx +/// @file UserProcessTeam.cc /// @brief UserProcess teams implementation. /***********************************************************************************/ -- cgit v1.2.3