thomas/mittos64
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a direct address for P4 rather than a pointer

Browse Source
This commit is contained in:
Thomas Lovén
2018-02-20 14:02:47 +01:00
parent 8711fee390
commit 36c517dd82
6 changed files with 97 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/kernel/memory/memory.c
View File

@@ -2,25 +2,29 @@
#include <multiboot.h>
#include <debug.h>
uint64_t kernel_P4;
void memory_init()
{
uintptr_t start, end;
kernel_P4 = (uint64_t)&BootP4;
uint64_t start, end;
uint32_t type, i = 0;
debug_info("Parsing memory map\n");
while(!multiboot_get_memory_area(i++, &start, &end, &type))
{
debug("0x%016x-0x%016x (%d)\n", start, end, type);
for(uintptr_t p = start; p < end; p += PAGE_SIZE)
for(uint64_t p = start; p < end; p += PAGE_SIZE)
{
if(p >= V2P(&kernel_start) && p < V2P(&kernel_end))
continue;
uintptr_t page = vmm_get_page(&BootP4, (uintptr_t)P2V(p));
if(page == (uintptr_t)-1 || !(page & PAGE_PRESENT))
uint64_t addr = (uint64_t)P2V(p);
uint64_t page = vmm_get_page(kernel_P4, addr);
if(!PAGE_EXIST(page) || !(page & PAGE_PRESENT))
{
uint16_t flags = PAGE_GLOBAL | PAGE_HUGE | PAGE_WRITE;
touch_page(&BootP4, (uintptr_t)P2V(p), flags);
vmm_set_page(&BootP4, (uintptr_t)P2V(p), p, flags | PAGE_PRESENT);
touch_page(kernel_P4, addr, flags);
vmm_set_page(kernel_P4, addr, p, flags | PAGE_PRESENT);
}
if(type == MMAP_FREE)