From d87eb24271671f4d7d1298c6c4bbdf4e73f774f3 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 30 Aug 2024 08:43:46 +0200 Subject: A lot of fixes regarding the kernel: + Either choose NewFS or generic filesystem interface for FileStream class. + Fixed PEF code manager executable probing method, inside it's Loader class. + Add function mm_update_page for virtual memory purposes. - Remove logging on HardwareTimer class. --- dev/ZKA/KernelKit/CodeManager.hxx | 2 +- dev/ZKA/KernelKit/FileManager.hxx | 2 +- dev/ZKA/KernelKit/PEFCodeManager.hxx | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'dev/ZKA/KernelKit') diff --git a/dev/ZKA/KernelKit/CodeManager.hxx b/dev/ZKA/KernelKit/CodeManager.hxx index b551815e..513e65b7 100644 --- a/dev/ZKA/KernelKit/CodeManager.hxx +++ b/dev/ZKA/KernelKit/CodeManager.hxx @@ -27,5 +27,5 @@ namespace Kernel /// @note This sets up a new stack, anything on the main function that calls the kernel will not be accessible. /// @param main the start of the process. /// @return if the process was started or not. - bool execute_from_image(MainKind main, const Char* processName) noexcept; + bool execute_from_image(MainKind main, const Char* process_name) noexcept; } // namespace Kernel diff --git a/dev/ZKA/KernelKit/FileManager.hxx b/dev/ZKA/KernelKit/FileManager.hxx index 67f2f501..cbfc1e30 100644 --- a/dev/ZKA/KernelKit/FileManager.hxx +++ b/dev/ZKA/KernelKit/FileManager.hxx @@ -188,7 +188,7 @@ namespace Kernel * @tparam Encoding file encoding (char, wchar_t...) * @tparam FSClass Filesystem contract who takes care of it. */ - template class FileStream final { diff --git a/dev/ZKA/KernelKit/PEFCodeManager.hxx b/dev/ZKA/KernelKit/PEFCodeManager.hxx index 2935f709..dd6daca5 100644 --- a/dev/ZKA/KernelKit/PEFCodeManager.hxx +++ b/dev/ZKA/KernelKit/PEFCodeManager.hxx @@ -46,11 +46,16 @@ namespace Kernel bool IsLoaded() noexcept; private: +#ifdef __FSKIT_USE_NEWFS__ + OwnPtr> fFile; +#else OwnPtr> fFile; - Ref fPath; - VoidPtr fCachedBlob; - bool fFatBinary; - bool fBad; +#endif // __FSKIT_USE_NEWFS__ + + Ref fPath; + VoidPtr fCachedBlob; + bool fFatBinary; + bool fBad; }; namespace Utils -- cgit v1.2.3