From 7477a0f942c374b652da4f80cdb36d4661aac3c8 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sun, 13 Oct 2024 15:29:55 +0200 Subject: IMP: Delete the memory list when exiting process. IMP: Add Allocation (and delete) of MemoryList. IMP: BitMap allocator must now allocate directories as well. IMP: Add Handover arch to check if executable is an AMD64 executable or ARM64 executable. FIX: Add ::EFI::Stop, when a thread doesn't load correctly. Signed-off-by: Amlal El Mahrouss --- dev/zka/src/UserProcessScheduler.cxx | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) (limited to 'dev/zka/src/UserProcessScheduler.cxx') diff --git a/dev/zka/src/UserProcessScheduler.cxx b/dev/zka/src/UserProcessScheduler.cxx index 00249896..0819e638 100644 --- a/dev/zka/src/UserProcessScheduler.cxx +++ b/dev/zka/src/UserProcessScheduler.cxx @@ -12,6 +12,7 @@ /// @brief User Process scheduler. /***********************************************************************************/ +#include #include #include #include @@ -169,8 +170,9 @@ namespace Kernel auto pd = hal_read_cr3(); hal_write_cr3(reinterpret_cast(this->MemoryPD)); - Bool ret = mm_delete_heap(ptr); - hal_write_cr3(reinterpret_cast(pd)); + auto ret = mm_delete_heap(entry->MemoryEntry); + + hal_write_cr3(pd); return ret; #else @@ -233,6 +235,32 @@ namespace Kernel fLastExitCode = exit_code; cLastExitCode = exit_code; + auto memory_list = this->MemoryEntryList; + + // Deleting memory lists. Make sure to free all of them. + while (memory_list) + { + if (memory_list->MemoryEntry) + { + auto pd = hal_read_cr3(); + hal_write_cr3(reinterpret_cast(this->MemoryPD)); + + MUST_PASS(mm_delete_heap(memory_list->MemoryEntry)); + + hal_write_cr3(pd); + } + + auto next = memory_list->MemoryNext; + + mm_delete_heap(memory_list); + memory_list = nullptr; + + memory_list = next; + } + + //! Free the memory's page directory. + HAL::mm_free_bitmap(reinterpret_cast(this->MemoryPD)); + //! Delete image if not done already. if (this->Image && mm_is_valid_heap(this->Image)) mm_delete_heap(this->Image); @@ -275,7 +303,7 @@ namespace Kernel return 0; #ifdef __ZKA_AMD64__ - process.MemoryPD = reinterpret_cast(hal_read_cr3()); + process.MemoryPD = reinterpret_cast(HAL::mm_alloc_bitmap(Yes, Yes, sizeof(PDE), Yes)); #endif // __ZKA_AMD64__ process.Status = ProcessStatusKind::kStarting; -- cgit v1.2.3