From 4ce1fdaa5ad4252bff486a824f53cb93cc156925 Mon Sep 17 00:00:00 2001 From: Amlal EL Mahrouss Date: Thu, 1 Aug 2024 09:48:24 +0200 Subject: MHR-39: Implement entrypoint probe, can now find it. Next step is to map the sections into their own addresses. Signed-off-by: Amlal EL Mahrouss --- Kernel/KernelKit/MP.hxx | 130 +++++++++++++++++++++++++++++++++++++++++ Kernel/KernelKit/MPManager.hpp | 129 ---------------------------------------- Kernel/KernelKit/PE.hxx | 73 +++++++++++++---------- Kernel/KernelKit/User.hxx | 14 ++--- 4 files changed, 178 insertions(+), 168 deletions(-) create mode 100644 Kernel/KernelKit/MP.hxx delete mode 100644 Kernel/KernelKit/MPManager.hpp (limited to 'Kernel/KernelKit') diff --git a/Kernel/KernelKit/MP.hxx b/Kernel/KernelKit/MP.hxx new file mode 100644 index 00000000..325e399c --- /dev/null +++ b/Kernel/KernelKit/MP.hxx @@ -0,0 +1,130 @@ +/* ------------------------------------------- + + Copyright ZKA Technologies + +------------------------------------------- */ + +#ifndef __INC_MP_MANAGER_HPP__ +#define __INC_MP_MANAGER_HPP__ + +#include +#include +#include + +/// @note Last Rev Sun 28 Jul CET 2024 +/// @note Last Rev Thu, Aug 1, 2024 9:07:38 AM + +#define cMaxHWThreads (8U) + +namespace Kernel +{ + class HardwareThread; + class MPCoreScheduler; + + using ThreadID = UInt32; + + enum ThreadKind + { + kHartSystemReserved, // System reserved thread, well user can't use it + kHartStandard, // user thread, cannot be used by kernel + kHartFallback, // fallback thread, cannot be used by user if not clear or + // used by kernel. + kHartBoot, // The core we booted from, the mama. + kInvalidHart, + kHartCount, + }; + + typedef enum ThreadKind SmThreadKind; + typedef ThreadID SmThreadID; + + /// + /// \name HardwareThread + /// \brief Abstraction over the CPU's core, used to run processes or threads. + /// + + class HardwareThread final + { + public: + explicit HardwareThread(); + ~HardwareThread(); + + public: + NEWOS_COPY_DEFAULT(HardwareThread) + + public: + operator bool(); + + public: + void Wake(const bool wakeup = false) noexcept; + void Busy(const bool busy = false) noexcept; + + public: + bool Switch(HAL::StackFrame* stack); + bool IsWakeup() noexcept; + + public: + HAL::StackFrame* StackFrame() noexcept; + const ThreadKind& Kind() noexcept; + bool IsBusy() noexcept; + const ThreadID& ID() noexcept; + + private: + HAL::StackFrame* fStack{nullptr}; + ThreadKind fKind{ThreadKind::kInvalidHart}; + ThreadID fID{0}; + ProcessID fSourcePID{-1}; + bool fWakeup{false}; + bool fBusy{false}; + + private: + friend class MPCoreScheduler; + }; + + /// + /// \name MPCoreScheduler + /// \brief Class to manage the thread scheduling. + /// + + class MPCoreScheduler final + { + private: + explicit MPCoreScheduler(); + + public: + ~MPCoreScheduler(); + NEWOS_COPY_DEFAULT(MPCoreScheduler); + + public: + bool Switch(HAL::StackFramePtr the); + HAL::StackFramePtr Leak() noexcept; + + public: + Ref operator[](const SizeT& idx); + bool operator!() noexcept; + operator bool() noexcept; + + public: + /// @brief Shared instance of the MP Manager. + /// @return the reference to the mp manager class. + static Ref The(); + + public: + /// @brief Returns the amount of threads present in the system. + /// @returns SizeT the amount of cores present. + SizeT Count() noexcept; + + private: + Array fThreadList; + ThreadID fCurrentThread{0}; + }; + + /// @brief wakes up thread. + /// wakes up thread from hang. + Void mp_wakeup_thread(HAL::StackFramePtr stack); + + /// @brief makes thread sleep. + /// hooks and hangs thread to prevent code from executing. + Void mp_hang_thread(HAL::StackFramePtr stack); +} // namespace Kernel + +#endif // !__INC_MP_MANAGER_HPP__ diff --git a/Kernel/KernelKit/MPManager.hpp b/Kernel/KernelKit/MPManager.hpp deleted file mode 100644 index c54f0aaf..00000000 --- a/Kernel/KernelKit/MPManager.hpp +++ /dev/null @@ -1,129 +0,0 @@ -/* ------------------------------------------- - - Copyright ZKA Technologies - -------------------------------------------- */ - -#ifndef __INC_MP_MANAGER_HPP__ -#define __INC_MP_MANAGER_HPP__ - -#include -#include -#include - -/// @note Last Rev Sun 28 Jul CET 2024 - -#define kMaxHarts 8 - -namespace Kernel -{ - class HardwareThread; - class MPManager; - - using ThreadID = UInt32; - - enum ThreadKind - { - kHartSystemReserved, // System reserved thread, well user can't use it - kHartStandard, // user thread, cannot be used by kernel - kHartFallback, // fallback thread, cannot be used by user if not clear or - // used by kernel. - kHartBoot, // The core we booted from, the mama. - kInvalidHart, - kHartCount, - }; - - typedef enum ThreadKind SmThreadKind; - typedef ThreadID SmThreadID; - - /// - /// \name HardwareThread - /// @brief CPU Hardware Thread (POWER, x64, or 64x0) - /// - - class HardwareThread final - { - public: - explicit HardwareThread(); - ~HardwareThread(); - - public: - NEWOS_COPY_DEFAULT(HardwareThread) - - public: - operator bool(); - - public: - void Wake(const bool wakeup = false) noexcept; - void Busy(const bool busy = false) noexcept; - - public: - bool Switch(HAL::StackFrame* stack); - bool IsWakeup() noexcept; - - public: - HAL::StackFrame* StackFrame() noexcept; - const ThreadKind& Kind() noexcept; - bool IsBusy() noexcept; - const ThreadID& ID() noexcept; - - private: - HAL::StackFrame* fStack{nullptr}; - ThreadKind fKind{ThreadKind::kInvalidHart}; - ThreadID fID{0}; - ProcessID fSourcePID{-1}; - bool fWakeup{false}; - bool fBusy{false}; - - private: - friend class MPManager; - }; - - /// - /// \name MPManager - /// @brief Multi processor manager to manage other cores and dispatch tasks. - /// - - class MPManager final - { - private: - explicit MPManager(); - - public: - ~MPManager(); - NEWOS_COPY_DEFAULT(MPManager); - - public: - bool Switch(HAL::StackFramePtr the); - HAL::StackFramePtr Leak() noexcept; - - public: - Ref operator[](const SizeT& idx); - bool operator!() noexcept; - operator bool() noexcept; - - public: - /// @brief Shared instance of the SMP Manager. - /// @return the reference to the smp manager. - static Ref The(); - - public: - /// @brief Returns the amount of threads present in the system. - /// @returns SizeT the amount of cores present. - SizeT Count() noexcept; - - private: - Array fThreadList; - ThreadID fCurrentThread{0}; - }; - - /// @brief wakes up thread. - /// wakes up thread from hang. - Void mp_wakeup_thread(HAL::StackFramePtr stack); - - /// @brief makes thread sleep. - /// hooks and hangs thread to prevent code from executing. - Void mp_hang_thread(HAL::StackFramePtr stack); -} // namespace Kernel - -#endif // !__INC_MP_MANAGER_HPP__ diff --git a/Kernel/KernelKit/PE.hxx b/Kernel/KernelKit/PE.hxx index debd6aba..0788cd2d 100644 --- a/Kernel/KernelKit/PE.hxx +++ b/Kernel/KernelKit/PE.hxx @@ -26,7 +26,6 @@ typedef struct ExecHeader final { - Kernel::UInt32 mMagic; // PE\0\0 or 0x00004550 Kernel::UInt16 mMachine; Kernel::UInt16 mNumberOfSections; Kernel::UInt32 mTimeDateStamp; @@ -38,40 +37,41 @@ typedef struct ExecHeader final typedef struct ExecOptionalHeader final { - Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) - Kernel::UChar mMajorLinkerVersion; - Kernel::UChar mMinorLinkerVersion; - Kernel::UIntPtr mSizeOfCode; - Kernel::UIntPtr mSizeOfInitializedData; - Kernel::UIntPtr mSizeOfUninitializedData; - Kernel::UInt32 mAddressOfEntryPoint; - Kernel::UInt32 mBaseOfCode; - Kernel::UIntPtr mImageBase; - Kernel::UInt32 mSectionAlignment; - Kernel::UInt32 mFileAlignment; - Kernel::UInt16 mMajorOperatingSystemVersion; - Kernel::UInt16 mMinorOperatingSystemVersion; - Kernel::UInt16 mMajorImageVersion; - Kernel::UInt16 mMinorImageVersion; - Kernel::UInt16 mMajorSubsystemVersion; - Kernel::UInt16 mMinorSubsystemVersion; - Kernel::UInt32 mWin32VersionValue; - Kernel::UIntPtr mSizeOfImage; - Kernel::UIntPtr mSizeOfHeaders; - Kernel::UInt32 mCheckSum; - Kernel::UInt16 mSubsystem; - Kernel::UInt16 mDllCharacteristics; - Kernel::UIntPtr mSizeOfStackReserve; - Kernel::UIntPtr mSizeOfStackCommit; - Kernel::UIntPtr mSizeOfHeapReserve; - Kernel::UIntPtr mSizeOfHeapCommit; - Kernel::UInt32 mLoaderFlags; - Kernel::UInt32 mNumberOfRvaAndSizes; + Kernel::UInt16 mMagic; // 0x010b - PE32, 0x020b - PE32+ (64 bit) + Kernel::UInt8 mMajorLinkerVersion; + Kernel::UInt8 mMinorLinkerVersion; + Kernel::UInt32 mSizeOfCode; + Kernel::UInt32 mSizeOfInitializedData; + Kernel::UInt32 mSizeOfUninitializedData; + Kernel::UInt32 mAddressOfEntryPoint; + Kernel::UInt32 mBaseOfCode; + Kernel::UInt32 mBaseOfData; + Kernel::UInt32 mImageBase; + Kernel::UInt32 mSectionAlignment; + Kernel::UInt32 mFileAlignment; + Kernel::UInt16 mMajorOperatingSystemVersion; + Kernel::UInt16 mMinorOperatingSystemVersion; + Kernel::UInt16 mMajorImageVersion; + Kernel::UInt16 mMinorImageVersion; + Kernel::UInt16 mMajorSubsystemVersion; + Kernel::UInt16 mMinorSubsystemVersion; + Kernel::UInt32 mWin32VersionValue; + Kernel::UInt32 mSizeOfImage; + Kernel::UInt32 mSizeOfHeaders; + Kernel::UInt32 mCheckSum; + Kernel::UInt16 mSubsystem; + Kernel::UInt16 mDllCharacteristics; + Kernel::UInt32 mSizeOfStackReserve; + Kernel::UInt32 mSizeOfStackCommit; + Kernel::UInt32 mSizeOfHeapReserve; + Kernel::UInt32 mSizeOfHeapCommit; + Kernel::UInt32 mLoaderFlags; + Kernel::UInt32 mNumberOfRvaAndSizes; } PACKED ExecOptionalHeader, *ExecOptionalHeaderPtr; typedef struct ExecSectionHeader final { - Kernel::UChar mName[8]; + Kernel::Char mName[8]; Kernel::UInt32 mVirtualSize; Kernel::UInt32 mVirtualAddress; Kernel::UInt32 mSizeOfRawData; @@ -118,6 +118,15 @@ typedef struct ExecImportDirectory Kernel::UInt32 mThunkTableRva; } PACKED ExecImportDirectory, *ExecImportDirectoryPtr; -#define kPeStart "__ImageStart" +typedef struct ExecDataDirectory { + Kernel::UInt32 VirtualAddress; + Kernel::UInt32 Size; +} ExecDataDirectory, *ExecDataDirectoryPtr; + +typedef struct ExecImageHeader { + Kernel::UInt32 mSignature; + ExecHeader mHeader; + ExecOptionalHeader mOptHdr; +} ExecImageHeader, *ExecImageHeaderPtr; #endif /* ifndef __KERNELKIT_INC_PE_HXX__ */ diff --git a/Kernel/KernelKit/User.hxx b/Kernel/KernelKit/User.hxx index 64bb44a7..3f78047c 100644 --- a/Kernel/KernelKit/User.hxx +++ b/Kernel/KernelKit/User.hxx @@ -27,7 +27,7 @@ namespace Kernel { class User; - class UserView; + class UserManager; enum class RingKind { @@ -72,13 +72,13 @@ namespace Kernel StringView fUserName; VoidPtr fUserToken{nullptr}; - friend UserView; + friend UserManager; }; - class UserView final + class UserManager final { - UserView() = default; - ~UserView() = default; + UserManager() = default; + ~UserManager() = default; User* fCurrentUser = nullptr; User* fLastLoggedOffUser = nullptr; @@ -87,9 +87,9 @@ namespace Kernel User* fRootUser = nullptr; public: - NEWOS_COPY_DELETE(UserView); + NEWOS_COPY_DELETE(UserManager); - STATIC UserView* The() noexcept; + STATIC UserManager* The() noexcept; Bool LogIn(User* user, const Char* password) noexcept; User* Current() noexcept; Void LogOff() noexcept; -- cgit v1.2.3