From dfaf137915094e7ba72f7d7f1f57dc5158d1b6ab Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Tue, 9 Jul 2024 20:51:20 +0200 Subject: MHR-36: A set of major fixes for bootloader and kernel alongside new implementations. - Implement realloc for kernel scheduler improvements. - Fixed readAll on bootloader's BFileReader. - Add resources for zeta installation. - Add STB header. - Process Heap which replaced the previous User Heap. Signed-off-by: Amlal El Mahrouss --- Kernel/KernelKit/KernelHeap.hpp | 21 ++++++++++------ Kernel/KernelKit/ProcessHeap.hpp | 44 +++++++++++++++++++++++++++++++++ Kernel/KernelKit/ProcessScheduler.hxx | 6 ++--- Kernel/KernelKit/UserHeap.hpp | 46 ----------------------------------- 4 files changed, 60 insertions(+), 57 deletions(-) create mode 100644 Kernel/KernelKit/ProcessHeap.hpp delete mode 100644 Kernel/KernelKit/UserHeap.hpp (limited to 'Kernel/KernelKit') diff --git a/Kernel/KernelKit/KernelHeap.hpp b/Kernel/KernelKit/KernelHeap.hpp index 0d2f2188..dad0b83e 100644 --- a/Kernel/KernelKit/KernelHeap.hpp +++ b/Kernel/KernelKit/KernelHeap.hpp @@ -15,29 +15,34 @@ namespace Kernel { /// @brief Declare pointer as free. - /// @param heapPtr the pointer. + /// @param allocatedPtr the pointer. /// @return Int32 ke_delete_ke_heap(voidPtr allocatedPtr); + /// @brief Declare a new size for allocatedPtr. + /// @param allocatedPtr the pointer. + /// @return + voidPtr ke_realloc_ke_heap(voidPtr allocatedPtr, SizeT newSz); + /// @brief Check if pointer is a valid kernel pointer. - /// @param heapPtr the pointer + /// @param allocatedPtr the pointer /// @return if it exists. - Boolean ke_is_valid_heap(VoidPtr ptr); + Boolean ke_is_valid_heap(VoidPtr allocatedPtr); /// @brief allocate chunk of memory. /// @param sz size of pointer /// @param rw read write (true to enable it) /// @param user is it accesible by user processes? /// @return the pointer - voidPtr ke_new_ke_heap(SizeT sz, const bool rw, const bool user); + voidPtr ke_new_ke_heap(const SizeT sz, const Bool rw, const Bool user); /// @brief Protect the heap with a CRC value. - /// @param heapPtr HIB pointer. + /// @param allocatedPtr pointer. /// @return if it valid: point has crc now., otherwise fail. - Boolean ke_protect_ke_heap(VoidPtr heapPtr); + Boolean ke_protect_ke_heap(VoidPtr allocatedPtr); /// @brief Makes a kernel heap page. - /// @param heapPtr + /// @param allocatedPtr the page pointer. /// @return - Int32 ke_make_ke_page(VoidPtr heapPtr); + Int32 ke_make_ke_page(VoidPtr allocatedPtr); } // namespace Kernel diff --git a/Kernel/KernelKit/ProcessHeap.hpp b/Kernel/KernelKit/ProcessHeap.hpp new file mode 100644 index 00000000..0682d969 --- /dev/null +++ b/Kernel/KernelKit/ProcessHeap.hpp @@ -0,0 +1,44 @@ +/* ------------------------------------------- + + Copyright Zeta Electronics Corporation + +------------------------------------------- */ + +#pragma once + +#include +#include +#include +#include +#include +#include + +/// @version 5/11/23 +/// @file ProcessHeap.hpp +/// @brief memory heap for user processes. + +#define kUserHeapMaxSz (4096) +#define kUserHeapMag (0xFAF0FEF0) + +namespace Kernel +{ + typedef enum + { + /// @brief Shared heap. + kUserHeapShared = 0x4, + /// @brief User and private heap. + kUserHeapUser = 0x6, + /// @brief Read and Write heap. + kUserHeapRw = 0x8, + } kUserHeapFlags; + + /// @brief Allocate a process heap, no zero out is done here. + /// @param flags + /// @return The process's heap. + VoidPtr rt_new_heap(Int32 flags); + + /// @brief Frees the process heap. + /// @param pointer The process heap pointer. + /// @return + Int32 rt_free_heap(voidPtr pointer); +} // namespace Kernel diff --git a/Kernel/KernelKit/ProcessScheduler.hxx b/Kernel/KernelKit/ProcessScheduler.hxx index 7616e91a..578dc163 100644 --- a/Kernel/KernelKit/ProcessScheduler.hxx +++ b/Kernel/KernelKit/ProcessScheduler.hxx @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #define kSchedMinMicroTime (AffinityKind::kHartStandard) @@ -254,8 +254,8 @@ namespace Kernel ProcessTeam& CurrentTeam(); public: - SizeT Add(Ref& headerRef); - bool Remove(SizeT headerIndex); + SizeT Add(Ref& processRef); + Bool Remove(SizeT processSlot); public: Ref& TheCurrent(); diff --git a/Kernel/KernelKit/UserHeap.hpp b/Kernel/KernelKit/UserHeap.hpp deleted file mode 100644 index 6f125fdc..00000000 --- a/Kernel/KernelKit/UserHeap.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/* ------------------------------------------- - - Copyright Zeta Electronics Corporation - -------------------------------------------- */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -/// @version 5/11/23 -/// @file UserHeap.hpp -/// @brief memory heap for user programs. - -#define kUserHeapMaxSz (4096) -#define kUserHeapMag (0xFAF0FEF0) - -namespace Kernel -{ - typedef enum - { - /// @brief Driver only heap. - kUserHeapDriver = 0x2, - /// @brief Shared heap. - kUserHeapShared = 0x4, - /// @brief User and private heap. - kUserHeapUser = 0x6, - /// @brief Read and Write heap. - kUserHeapRw = 0x8, - } kUserHeapFlags; - - /// @brief Allocate a process heap, no zero out is done here. - /// @param flags - /// @return The process's heap. - VoidPtr rt_new_heap(Int32 flags); - - /// @brief Frees the process heap. - /// @param pointer The process heap pointer. - /// @return - Int32 rt_free_heap(voidPtr pointer); -} // namespace Kernel -- cgit v1.2.3