ejung/bsb2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.ibr.cs.tu-bs.de:vss/teaching/ws25/v_bsb2/Gruppe_003

Browse Source
This commit is contained in:
Eggert Jung
2026-02-23 15:54:58 +01:00
parent 45e522941d c18bd3b4ac
commit 1b4bcff757
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/memory/pageframealloc.cc
View File

@@ -65,21 +65,29 @@ void PageFrameAllocator::init(){
//mark as unavailable
memory_map_entry = memory_map_start;
while(memory_map_entry != 0){
uintptr_t start = (uintptr_t)memory_map_entry->getStartAddress();
uintptr_t end = (uintptr_t)memory_map_entry->getEndAddress();
bool available = memory_map_entry->isAvailable();
uintptr_t start = (uintptr_t)memory_map_entry->getStartAddress();
uintptr_t end = (uintptr_t)memory_map_entry->getEndAddress();
bool available = memory_map_entry->isAvailable();
if(!available){
mark_pageframes(start, end, available);
}
if(!available){
mark_pageframes(start, end, available);
}
memory_map_entry = memory_map_entry->getNext();
memory_map_entry = memory_map_entry->getNext();
}
Multiboot::Module* mod = Multiboot::getModule(0);
for (size_t i = 0; i < Multiboot::getModuleCount(); ++i) {
Multiboot::Module* mod = Multiboot::getModule(i);
if (!mod) continue;
mark_pageframes((uintptr_t)mod, (uintptr_t)mod + 1, false);
mark_pageframes((uintptr_t)mod->getStartAddress(),
(uintptr_t)mod->getEndAddress(),
false);
}
mark_pageframes((uintptr_t)mod, (uintptr_t)mod+1, false);
mark_pageframes((uintptr_t)mod->getStartAddress(), (uintptr_t)mod->getEndAddress(), false);
//mark other known regions as unavailable
mark_pageframes((uintptr_t)&___KERNEL_START___, (uintptr_t)&___KERNEL_END___, false);