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

fix mark module unavailable

Browse Source
This commit is contained in:
Eggert Jung
2026-02-16 14:46:53 +01:00
parent 448aa638a7
commit 4d5d6913d7
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/main.cc
View File

@@ -43,8 +43,8 @@ OutputStream* copyout = &copystream;
alignas(4096) four_lvl_paging_t paging_tree;
static const uint32_t NUM_APPS = 9;
Application apps[NUM_APPS];
//static const uint32_t NUM_APPS = 9;
//Application apps[NUM_APPS];
//static KeyboardApplication kapp;
@@ -52,14 +52,14 @@ Application apps[NUM_APPS];
extern "C" int main() {
PageFrameAllocator::stats();
memset(&paging_tree, 0, sizeof(four_lvl_paging_t));
create_basic_page_table(&paging_tree);
load_cr3((void*)&paging_tree.l4);
Multiboot::Module* initrd = Multiboot::getModule(0);
DBG << "initrd address: " << hex << initrd->getStartAddress() << endl << "initrd size: " << initrd->getSize() << endl;
memcpy((void *)0x4000000, initrd->getStartAddress(), initrd->getSize());
memset(&paging_tree, 0, sizeof(four_lvl_paging_t));
create_basic_page_table(&paging_tree);
load_cr3((void*)&paging_tree.l4);
tout.reset();
tout.setPos(33, 0);
tout << OS_NAME << " (2.x)" << flush;
@@ -82,10 +82,11 @@ extern "C" int main() {
// Enter Level 1/2
Guarded g = Guard::enter();
for(void* p=Multiboot::getModule(0)->getStartAddress(); p<Multiboot::getModule(0)->getEndAddress(); p=(void*)((uintptr_t)p+4096)){
DBG << "module at: " << hex << p << endl;
g.vault().scheduler.ready(new Thread(false, p));
}
//for(void* p=Multiboot::getModule(0)->getStartAddress(); p<Multiboot::getModule(0)->getEndAddress(); p=(void*)((uintptr_t)p+4096)){
// DBG << "module at: " << hex << p << endl;
// g.vault().scheduler.ready(new Thread(false, p));
//}
g.vault().scheduler.ready(new Thread(false, (void*)((uintptr_t)Multiboot::getModule(0)->getStartAddress()+4096)));
//for (uint32_t i = 0; i < NUM_APPS; ++i) {
// g.vault().scheduler.ready(&(apps[i]));