From 408f58b0ef54f49d894023d6753f8d27d0bfd46d Mon Sep 17 00:00:00 2001 From: Amlal Date: Tue, 10 Sep 2024 18:42:15 +0200 Subject: [ IMP ] Repository bump. Signed-off-by: Amlal --- dev/ZKA/Sources/ExeMain.cxx | 2 +- dev/ZKA/Sources/FS/NeFS.cxx | 8 ++++---- dev/ZKA/Sources/Heap.cxx | 15 +-------------- dev/ZKA/Sources/PageMgr.cxx | 4 ++-- 4 files changed, 8 insertions(+), 21 deletions(-) (limited to 'dev/ZKA/Sources') diff --git a/dev/ZKA/Sources/ExeMain.cxx b/dev/ZKA/Sources/ExeMain.cxx index 44dedfd7..a3fdfaa0 100644 --- a/dev/ZKA/Sources/ExeMain.cxx +++ b/dev/ZKA/Sources/ExeMain.cxx @@ -58,7 +58,7 @@ namespace Kernel::Detail else { // Mounts a NeFS from main drive. - fNeFS = new Kernel::NeFileSystemMgr(); + fNeFS = Kernel::mm_new_class(); Kernel::IFilesystemMgr::Mount(fNeFS); diff --git a/dev/ZKA/Sources/FS/NeFS.cxx b/dev/ZKA/Sources/FS/NeFS.cxx index ad4dd031..9c33b78c 100644 --- a/dev/ZKA/Sources/FS/NeFS.cxx +++ b/dev/ZKA/Sources/FS/NeFS.cxx @@ -31,12 +31,12 @@ using namespace Kernel; /***********************************************************************************/ /// @brief get sector count. /***********************************************************************************/ -Kernel::SizeT drv_std_get_sector_count(); +Kernel::SizeT drv_get_sector_count(); /***********************************************************************************/ /// @brief get device size. /***********************************************************************************/ -Kernel::SizeT drv_std_get_drv_size(); +Kernel::SizeT drv_get_size(); #endif @@ -583,8 +583,8 @@ bool NeFSParser::Format(_Input _Output DriveTrait* drive, _Input const Lba endLb SizeT catalogCount = 0UL; - SizeT sectorCount = drv_std_get_sector_count(); - SizeT diskSize = drv_std_get_drv_size(); + SizeT sectorCount = drv_get_sector_count(); + SizeT diskSize = drv_get_size(); partBlock->Kind = kNeFSPartitionTypeStandard; partBlock->StartCatalog = kNeFSCatalogStartAddress; diff --git a/dev/ZKA/Sources/Heap.cxx b/dev/ZKA/Sources/Heap.cxx index cd46a80b..b415911d 100644 --- a/dev/ZKA/Sources/Heap.cxx +++ b/dev/ZKA/Sources/Heap.cxx @@ -14,11 +14,10 @@ //! @brief Kernel heap allocator. #define kKernelHeapMagic (0xD4D7D5) -#define kKernelHeapHeaderPaddingSz (16U) +#define kKernelHeapHeaderPaddingSz (__BIGGEST_ALIGNMENT__) namespace Kernel { - SizeT kHeapCount = 0UL; PageMgr kHeapPageMgr; Bool kHeapLock = No; @@ -115,8 +114,6 @@ namespace Kernel heap_info_ptr->fUser = user; heap_info_ptr->fPresent = Yes; - ++kHeapCount; - auto result = reinterpret_cast(heap_info_ptr->fHeapPtr); kLatestAllocation = heap_info_ptr; @@ -131,8 +128,6 @@ namespace Kernel /// @return Int32 mm_make_ke_page(VoidPtr heap_ptr) { - if (kHeapCount < 1) - return -kErrorInternal; if (((IntPtr)heap_ptr - sizeof(Detail::HEAP_INFORMATION_BLOCK)) <= 0) return -kErrorInternal; if (((IntPtr)heap_ptr - kInvalidAddress) < 0) @@ -156,9 +151,6 @@ namespace Kernel /// @return Int32 mm_delete_ke_heap(VoidPtr heap_ptr) { - if (kHeapCount < 1) - return -kErrorInternal; - if (!heap_ptr) return -kErrorInvalidData; @@ -203,8 +195,6 @@ namespace Kernel kHeapPageMgr.Free(pteAddress); - --kHeapCount; - Detail::mm_alloc_fini_timeout(); return 0; @@ -218,9 +208,6 @@ namespace Kernel /// @return if it exists. Boolean mm_is_valid_heap(VoidPtr heap_ptr) { - if (kHeapCount < 1) - return false; - if (heap_ptr) { Detail::HEAP_INFORMATION_BLOCK_PTR virtualAddress = diff --git a/dev/ZKA/Sources/PageMgr.cxx b/dev/ZKA/Sources/PageMgr.cxx index 78b279f3..3eefe491 100644 --- a/dev/ZKA/Sources/PageMgr.cxx +++ b/dev/ZKA/Sources/PageMgr.cxx @@ -8,9 +8,9 @@ #include #ifdef __ZKA_AMD64__ -#include +#include #elif defined(__ZKA_ARM64__) -#include +#include #endif // ifdef __ZKA_AMD64__ || defined(__ZKA_ARM64__) //! null deref will throw (Page Zero detected, aborting app!) -- cgit v1.2.3