asleepymoon/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

Finish VMM

Browse Source
This commit is contained in:
apio 2022-09-06 13:49:17 +02:00
parent 8bff2ee0f5
commit 0fbc68ca88
3 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/include/memory/VMM.h
View File

@ -5,13 +5,16 @@ namespace Paging
{ {
class VirtualMemoryManager class VirtualMemoryManager
{ {
void Init(); // fetch page table from cr3 public:
void Init(PageTable* PML4); void init(); // fetch page table from cr3
void init(PageTable* PML4);
void Map(uint64_t virtualAddress, uint64_t physicalAddress); void map(uint64_t virtualAddress, uint64_t physicalAddress);
void Unmap(uint64_t virtualAddress); void unmap(uint64_t virtualAddress);
private: private:
PageTable* PML4; PageTable* PML4;
}; };
} }
extern Paging::VirtualMemoryManager kernelVMM;

2
kernel/src/init/Init.cpp
View File

@ -5,6 +5,7 @@
#include "interrupts/Interrupts.h" #include "interrupts/Interrupts.h"
#include "io/Serial.h" #include "io/Serial.h"
#include "memory/RangeAllocator.h" #include "memory/RangeAllocator.h"
#include "memory/VMM.h"
#include "panic/hang.h" #include "panic/hang.h"
#include "render/Draw.h" #include "render/Draw.h"
#include "render/TextRenderer.h" #include "render/TextRenderer.h"
@ -32,4 +33,5 @@ void Init::early_init()
// ASSERT(TextRenderer::try_initialize()); // ASSERT(TextRenderer::try_initialize());
physical_allocator.init_from_mmap(); physical_allocator.init_from_mmap();
kernelVMM.init();
} }

69
kernel/src/memory/VMM.cpp
View File

@ -1,18 +1,22 @@
#include "memory/VMM.h" #include "memory/VMM.h"
#include "memory/RangeAllocator.h"
#include "std/string.h"
Paging::VirtualMemoryManager kernelVMM;
namespace Paging namespace Paging
{ {
void VirtualMemoryManager::Init() void VirtualMemoryManager::init()
{ {
asm volatile("mov %%cr3, %0" : "=r"(PML4)); asm volatile("mov %%cr3, %0" : "=r"(PML4));
} }
void VirtualMemoryManager::Init(PageTable* PML4) void VirtualMemoryManager::init(PageTable* PML4)
{ {
this->PML4 = PML4; this->PML4 = PML4;
} }
void VirtualMemoryManager::Unmap(uint64_t virtualAddress) void VirtualMemoryManager::unmap(uint64_t virtualAddress)
{ {
virtualAddress >>= 12; virtualAddress >>= 12;
uint64_t P_i = virtualAddress & 0x1ff; uint64_t P_i = virtualAddress & 0x1ff;
@ -54,4 +58,63 @@ namespace Paging
PDE.ReadWrite = false; PDE.ReadWrite = false;
PT->entries[P_i] = PDE; PT->entries[P_i] = PDE;
} }
void VirtualMemoryManager::map(uint64_t virtualAddress, uint64_t physicalAddress)
{
virtualAddress >>= 12;
uint64_t P_i = virtualAddress & 0x1ff;
virtualAddress >>= 9;
uint64_t PT_i = virtualAddress & 0x1ff;
virtualAddress >>= 9;
uint64_t PD_i = virtualAddress & 0x1ff;
virtualAddress >>= 9;
uint64_t PDP_i = virtualAddress & 0x1ff;
PageDirectoryEntry PDE;
PDE = PML4->entries[PDP_i];
PageTable* PDP;
if (!PDE.Present)
{
PDP = (PageTable*)physical_allocator.request_page();
memset(PDP, 0, 0x1000);
PDE.Address = (uint64_t)PDP >> 12;
PDE.Present = true;
PDE.ReadWrite = true;
PML4->entries[PDP_i] = PDE;
}
else { PDP = (PageTable*)((uint64_t)PDE.Address << 12); }
PDE = PDP->entries[PD_i];
PageTable* PD;
if (!PDE.Present)
{
PD = (PageTable*)physical_allocator.request_page();
memset(PDP, 0, 0x1000);
PDE.Address = (uint64_t)PD >> 12;
PDE.Present = true;
PDE.ReadWrite = true;
PDP->entries[PD_i] = PDE;
}
else { PD = (PageTable*)((uint64_t)PDE.Address << 12); }
PDE = PD->entries[PT_i];
PageTable* PT;
if (!PDE.Present)
{
PT = (PageTable*)physical_allocator.request_page();
memset(PDP, 0, 0x1000);
PDE.Address = (uint64_t)PT >> 12;
PDE.Present = true;
PDE.ReadWrite = true;
PD->entries[PT_i] = PDE;
}
else { PT = (PageTable*)((uint64_t)PDE.Address << 12); }
PDE = PT->entries[P_i];
PDE.Present = true;
PDE.ReadWrite = true;
PDE.Address = physicalAddress >> 12;
PT->entries[P_i] = PDE;
}
} }