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

Also map non-free memory areas into kernel space

Browse Source
This commit is contained in:
Thomas Lovén 2018-01-04 00:39:50 +01:00
parent 3a4136c225
commit 470eb5e9f9
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kernel/boot/kmain.c
View File

@ -23,18 +23,17 @@ void kmain(uint64_t multiboot_magic, void *multiboot_data)
uint32_t type, i=0; uint32_t type, i=0;
while(!multiboot_get_memory_area(i++, &start, &end, &type)) while(!multiboot_get_memory_area(i++, &start, &end, &type))
{ {
if(type != 1) debug("Mem %d 0x%x-0x%x\n", type, start, end);
continue;
debug_printf("Mem %d 0x%x-0x%x\n", type, start, end);
for(uintptr_t p = start; p < end; p += PAGE_SIZE) for(uintptr_t p = start; p < end; p += PAGE_SIZE)
{ {
if(p >= V2P(&kernel_start) && p < V2P(&kernel_end)) if(p >= V2P(&kernel_start) && p < V2P(&kernel_end))
continue; continue;
if(!(p & 0x1FFFFF)) if(vmm_get_page(&BootP4, (uintptr_t)P2V(p)) == (uintptr_t)-1)
{ {
touch_page(&BootP4, (uintptr_t)P2V(p), PAGE_HUGE); touch_page(&BootP4, (uintptr_t)P2V(p), PAGE_WRITE | PAGE_HUGE);
vmm_set_page(&BootP4, (uintptr_t)P2V(p), p, PAGE_HUGE | PAGE_WRITE | PAGE_PRESENT); vmm_set_page(&BootP4, (uintptr_t)P2V(p), p, PAGE_HUGE | PAGE_WRITE | PAGE_PRESENT);
} }
if(type == 1)
pmm_free(p); pmm_free(p);
} }
} }