darkkirb/old-MTGos-old
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

! Fixed use of uninited memory

Browse source 
! Fixed infinite loop
This commit is contained in:
Morten Delenk 2016-05-06 11:07:07 +02:00
parent c6d89476cb
commit fb6491e190
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel/hal/x86/mm/pmm.cpp
View file

@ -114,16 +114,17 @@ auto PMM::init(struct multiboot_info* mb_info) -> void {
void *temp;
qdpmm >> temp;
pageTable=(uint16_t**)temp;
markUsed(pageTable,4096);
markUsed((void*)nullptr,4096);
for(int i=0;i<4096;i++)
pageTable[i]=nullptr;
markUsed(pageTable,4096);
markUsed((void*)nullptr,4096);
struct multiboot_mmap_entry* mmap = (struct multiboot_mmap_entry*) mb_info->mmap_addr;
struct multiboot_mmap_entry* mmap_end = (struct multiboot_mmap_entry*) ((unsigned int) mb_info->mmap_addr + mb_info->mmap_length);
while(mmap < mmap_end) {
if(mmap->type != 1) {
markUsed((void*)mmap->addr,mmap->len);
}
mmap++;
}
markUsed(&kernel_start,((uint32_t)&kernel_end)-((uint32_t)&kernel_start)); //Protect kernel)
multiboot_mod_list *mods = (multiboot_mod_list*) mb_info->mods_addr;