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

fix grillups

Browse Source
This commit is contained in:
Eggert Jung
2026-02-17 18:53:22 +01:00
parent 81781c823f
commit 4cedc4088f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/main.cc
View File

@@ -55,7 +55,7 @@ extern "C" int main() {
Multiboot::Module* initrd = Multiboot::getModule(0); Multiboot::Module* initrd = Multiboot::getModule(0);
DBG << "initrd address: " << hex << initrd->getStartAddress() << endl << "initrd size: " << initrd->getSize() << endl; DBG << "initrd address: " << hex << initrd->getStartAddress() << endl << "initrd size: " << initrd->getSize() << endl;
memcpy((void *)0x4000000, initrd->getStartAddress(), initrd->getSize()); memcpy((void *)0x4000000, initrd->getStartAddress(), initrd->getSize());
mark_pageframes(0x400000, 0x4000000 + initrd->getSize(), false); mark_pageframes(0x4000000, 0x4000000 + initrd->getSize(), false);
memset(&paging_tree, 0, sizeof(four_lvl_paging_t)); memset(&paging_tree, 0, sizeof(four_lvl_paging_t));
create_basic_page_table(&paging_tree); create_basic_page_table(&paging_tree);
@@ -89,8 +89,8 @@ extern "C" int main() {
uint32_t appsize = (*apps_header)[i]; uint32_t appsize = (*apps_header)[i];
uintptr_t appstart = (0x4000+offset)<<12; uintptr_t appstart = (0x4000+offset)<<12;
DBG << "app " << i << " size " << appsize << " at " << appstart << endl; DBG << "app " << i << " size " << appsize << " at " << appstart << endl;
g.vault().scheduler.ready(new Thread(false, (void*)appstart)); g.vault().scheduler.ready(new Thread(false, (void*)appstart, (appsize/4096)+1)); //TODO fix edgecase on size=4096
offset += 1+(appsize-1/4096); offset += 1+(appsize/4096);
} }
//for(void* p=Multiboot::getModule(0)->getStartAddress(); p<Multiboot::getModule(0)->getEndAddress(); p=(void*)((uintptr_t)p+4096)){ //for(void* p=Multiboot::getModule(0)->getStartAddress(); p<Multiboot::getModule(0)->getEndAddress(); p=(void*)((uintptr_t)p+4096)){
// DBG << "module at: " << hex << p << endl; // DBG << "module at: " << hex << p << endl;