diff options
| -rw-r--r-- | dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx | 2 | ||||
| -rw-r--r-- | dev/ZKA/HALKit/AMD64/HalProcessor.cxx (renamed from dev/ZKA/HALKit/AMD64/HalProcessorMgr.cxx) | 8 | ||||
| -rw-r--r-- | dev/ZKA/Sources/Heap.cxx | 10 |
3 files changed, 11 insertions, 9 deletions
diff --git a/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx b/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx index e12f3765..3d9cc90f 100644 --- a/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx +++ b/dev/ZKA/HALKit/AMD64/HalBMPMgr.cxx @@ -141,7 +141,7 @@ namespace Kernel ptr_bit_set[0] = cBitMpMagic; ptr_bit_set[2] = No; - mm_map_page(page_ptr, ~eFlagsPresent); + mm_map_page(page_ptr, ~eFlagsPresent | ~eFlagsUser); return true; } diff --git a/dev/ZKA/HALKit/AMD64/HalProcessorMgr.cxx b/dev/ZKA/HALKit/AMD64/HalProcessor.cxx index 1df0fd5c..e2ef1902 100644 --- a/dev/ZKA/HALKit/AMD64/HalProcessorMgr.cxx +++ b/dev/ZKA/HALKit/AMD64/HalProcessor.cxx @@ -25,17 +25,17 @@ namespace Kernel::HAL { UInt8 cPageBitMp[cBmpPgSz] = {0}; // Bitmap to track free/used pages - void pg_set_used(Int64 page_index) + Void pg_set_used(Int64 page_index) { cPageBitMp[page_index / 8] |= (1 << (page_index % 8)); } - void pg_set_free(Int64 page_index) + Void pg_set_free(Int64 page_index) { cPageBitMp[page_index / 8] &= ~(1 << (page_index % 8)); } - int pg_is_free(Int64 page_index) + Int32 pg_is_free(Int64 page_index) { return !(cPageBitMp[page_index / 8] & (1 << (page_index % 8))); } @@ -56,7 +56,7 @@ namespace Kernel::HAL return nullptr; // No free page found } - void pg_delete(void* addr) + Void pg_delete(void* addr) { Int64 page_index = (UIntPtr)addr / cPageSz; kcout << "Page has been freed at: " << number(page_index) << endl; diff --git a/dev/ZKA/Sources/Heap.cxx b/dev/ZKA/Sources/Heap.cxx index 1f9af6a2..cd46a80b 100644 --- a/dev/ZKA/Sources/Heap.cxx +++ b/dev/ZKA/Sources/Heap.cxx @@ -94,18 +94,20 @@ namespace Kernel { Detail::mm_alloc_init_timeout(); - auto szFix = sz; + auto sz_fix = sz; - if (szFix == 0) + if (sz_fix == 0) return nullptr; - auto wrapper = kHeapPageMgr.Request(rw, user, No, szFix); + sz_fix += sizeof(Detail::HEAP_INFORMATION_BLOCK); + + auto wrapper = kHeapPageMgr.Request(rw, user, No, sz_fix); Detail::HEAP_INFORMATION_BLOCK_PTR heap_info_ptr = reinterpret_cast<Detail::HEAP_INFORMATION_BLOCK_PTR>( wrapper.VirtualAddress() + sizeof(Detail::HEAP_INFORMATION_BLOCK)); - heap_info_ptr->fHeapSize = szFix; + heap_info_ptr->fHeapSize = sz_fix; heap_info_ptr->fMagic = kKernelHeapMagic; heap_info_ptr->fCRC32 = No; // dont fill it for now. heap_info_ptr->fHeapPtr = reinterpret_cast<UIntPtr>(heap_info_ptr) + sizeof(Detail::HEAP_INFORMATION_BLOCK); |