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

Kernel: namespace and function renames

Browse Source 
MMU moved to namespace kernel
Kernel::Memory::Heap moved to just Kernel
MMU::map_{page,range} renamed to identity_map_{page,range}

Add MMU::get_page_flags
This commit is contained in:
Bananymous
2023-04-28 14:45:09 +03:00
parent acf5660090
commit 55bb0084aa
12 changed files with 473 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/kernel/ACPI.cpp
View File

@@ -105,7 +105,7 @@ namespace Kernel
if (rsdp->revision >= 2)
{
const XSDT* xsdt = (const XSDT*)rsdp->xsdt_address;
MMU::get().map_page((uintptr_t)xsdt, MMU::Flags::Present);
MMU::get().identity_map_page((uintptr_t)xsdt, MMU::Flags::Present);
BAN::ScopeGuard _([xsdt] { MMU::get().unmap_page((uintptr_t)xsdt); });
if (memcmp(xsdt->signature, "XSDT", 4) != 0)
@@ -120,7 +120,7 @@ namespace Kernel
else
{
const RSDT* rsdt = (const RSDT*)(uintptr_t)rsdp->rsdt_address;
MMU::get().map_page((uintptr_t)rsdt, MMU::Flags::Present);
MMU::get().identity_map_page((uintptr_t)rsdt, MMU::Flags::Present);
BAN::ScopeGuard _([rsdt] { MMU::get().unmap_page((uintptr_t)rsdt); });
if (memcmp(rsdt->signature, "RSDT", 4) != 0)
@@ -133,13 +133,13 @@ namespace Kernel
m_entry_count = (rsdt->length - sizeof(SDTHeader)) / 4;
}
MMU::get().map_range(m_header_table, m_entry_count * m_entry_size, MMU::Flags::Present);
MMU::get().identity_map_range(m_header_table, m_entry_count * m_entry_size, MMU::Flags::Present);
for (uint32_t i = 0; i < m_entry_count; i++)
{
auto* header = get_header_from_index(i);
MMU::get().map_page((uintptr_t)header, MMU::Flags::Present);
MMU::get().map_range((uintptr_t)header, header->length, MMU::Flags::Present);
MMU::get().identity_map_page((uintptr_t)header, MMU::Flags::Present);
MMU::get().identity_map_range((uintptr_t)header, header->length, MMU::Flags::Present);
}
return {};

6
kernel/kernel/APIC.cpp
View File

@@ -81,6 +81,8 @@ union RedirectionEntry
};
};
using namespace Kernel;
APIC* APIC::create()
{
uint32_t ecx, edx;
@@ -144,10 +146,10 @@ APIC* APIC::create()
return nullptr;
}
MMU::get().map_page(apic->m_local_apic, MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_page(apic->m_local_apic, MMU::Flags::ReadWrite | MMU::Flags::Present);
for (auto& io_apic : apic->m_io_apics)
{
MMU::get().map_page(io_apic.address, MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_page(io_apic.address, MMU::Flags::ReadWrite | MMU::Flags::Present);
io_apic.max_redirs = io_apic.read(IOAPIC_MAX_REDIRS);
}

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

@@ -4,7 +4,7 @@
extern uint8_t g_kernel_end[];
namespace Kernel::Memory
namespace Kernel
{
PhysicalRange::PhysicalRange(paddr_t start, size_t size)
@@ -36,7 +36,7 @@ namespace Kernel::Memory
m_list_pages = BAN::Math::div_round_up<uint64_t>(m_total_pages * sizeof(node), PAGE_SIZE);
m_reservable_pages = m_total_pages - m_list_pages;
MMU::get().map_range(m_start, m_list_pages * PAGE_SIZE, MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_range(m_start, m_list_pages * PAGE_SIZE, MMU::Flags::ReadWrite | MMU::Flags::Present);
// Initialize page list so that every page points to the next one
node* page_list = (node*)m_start;

4
kernel/kernel/Process.cpp
View File

@@ -77,7 +77,7 @@ namespace Kernel
MUST(process->m_allocated_pages.reserve(page_end - page_start + 1));
for (size_t page = page_start; page <= page_end; page++)
{
auto paddr = Memory::Heap::get().take_free_page();
auto paddr = Heap::get().take_free_page();
MUST(process->m_allocated_pages.push_back(paddr));
process->m_mmu->map_page_at(paddr, page * 4096, flags);
}
@@ -115,7 +115,7 @@ namespace Kernel
delete m_mmu;
}
for (auto paddr : m_allocated_pages)
Memory::Heap::get().release_page(paddr);
Heap::get().release_page(paddr);
}
void Process::add_thread(Thread* thread)

4
kernel/kernel/Terminal/VesaTerminalDriver.cpp
View File

@@ -4,6 +4,8 @@
#include <kernel/multiboot.h>
#include <kernel/Terminal/VesaTerminalDriver.h>
using namespace Kernel;
VesaTerminalDriver* VesaTerminalDriver::create()
{
if (!(g_multiboot_info->flags & MULTIBOOT_FLAGS_FRAMEBUFFER))
@@ -34,7 +36,7 @@ VesaTerminalDriver* VesaTerminalDriver::create()
return nullptr;
}
MMU::get().map_range(framebuffer.addr, framebuffer.pitch * framebuffer.height, MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
MMU::get().identity_map_range(framebuffer.addr, framebuffer.pitch * framebuffer.height, MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
auto* driver = new VesaTerminalDriver(
framebuffer.width,

2
kernel/kernel/Thread.cpp
View File

@@ -44,7 +44,7 @@ namespace Kernel
delete thread;
return BAN::Error::from_errno(ENOMEM);
}
process->mmu().map_range(thread->stack_base(), thread->stack_size(), MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
process->mmu().identity_map_range(thread->stack_base(), thread->stack_size(), MMU::Flags::UserSupervisor | MMU::Flags::ReadWrite | MMU::Flags::Present);
return thread;
}

2
kernel/kernel/kernel.cpp
View File

@@ -139,7 +139,7 @@ extern "C" void kernel_main()
ASSERT(tty1);
dprintln("TTY initialized");
Memory::Heap::initialize();
Heap::initialize();
dprintln("Heap initialzed");
parse_command_line();