Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Heap allows us to take free pages.

Browse Source 
The API is kinda weird and will probably be reworked in near future
but this will work for now :)
This commit is contained in:
Bananymous
2023-04-18 10:16:09 +03:00
parent 295a27f16a
commit 96ac072166
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/kernel/Memory/Heap.cpp
View File

@@ -141,7 +141,7 @@ namespace Kernel::Memory
if (mmmt->type == 1)
{
PhysicalRange range(mmmt->base_addr, mmmt->length);
if (range.usable_pages() > 0)
if (range.usable_memory() > 0)
MUST(m_physical_ranges.push_back(range));
}
@@ -151,11 +151,37 @@ namespace Kernel::Memory
size_t total = 0;
for (auto& range : m_physical_ranges)
{
size_t bytes = range.usable_pages() * PAGE_SIZE;
dprintln("RAM {8H}->{8H}, {} pages ({}.{} MB)", range.usable_start(), range.usable_end(), range.usable_pages(), bytes / (1 << 20), bytes % (1 << 20) * 1000 / (1 << 20));
size_t bytes = range.usable_memory();
dprintln("RAM {8H}->{8H} ({}.{} MB)", range.start(), range.end(), bytes / (1 << 20), bytes % (1 << 20) * 1000 / (1 << 20));
total += bytes;
}
dprintln("Total RAM {}.{} MB", total / (1 << 20), total % (1 << 20) * 1000 / (1 << 20));
}
paddr_t Heap::take_mapped_page(uint8_t flags)
{
for (auto& range : m_physical_ranges)
{
if (paddr_t page = range.reserve_page(); page != PhysicalRange::invalid)
{
MMU::get().allocate_page(page, flags);
return page;
}
}
ASSERT_NOT_REACHED();
}
void Heap::return_mapped_page(paddr_t addr)
{
for (auto& range : m_physical_ranges)
{
if (range.contains(addr))
{
MMU::get().unallocate_page(addr);
return;
}
}
ASSERT_NOT_REACHED();
}
}