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

parse header

Browse Source
This commit is contained in:
Eggert Jung
2026-02-17 16:00:11 +01:00
parent 3234447bbb
commit 3d1c8a2200
5 changed files with 44 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kernel/main.cc
View File

@@ -3,6 +3,7 @@
#include "./debug/output.h"
#include "./types.h" // This is actually used
#include "arch/core_interrupt.h"
#include "memory/page.h"
#include "memory/pageframealloc.h"
#include "memory/pagetable.h"
#include "object/outputstream.h"
@@ -82,12 +83,20 @@ extern "C" int main() {
// Enter Level 1/2
Guarded g = Guard::enter();
uint32_t (*apps_header)[1024] = (uint32_t (*)[1024])Multiboot::getModule(0)->getStartAddress();
uint64_t offset = 1;
for(uint16_t i = 1; i <= (*apps_header)[0]; i++){
uint32_t appsize = (*apps_header)[i];
uintptr_t appstart = (0x4000+offset)<<12;
DBG << "app " << i << " size " << appsize << " at " << appstart << endl;
g.vault().scheduler.ready(new Thread(false, (void*)appstart));
offset += 1+(appsize/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;
// g.vault().scheduler.ready(new Thread(false, p));
//}
g.vault().scheduler.ready(new Thread(false, (void*)0x4001000));
load_cr3((void*)&paging_tree.l4);
//g.vault().scheduler.ready(new Thread(false, (void*)0x4001000));
//for (uint32_t i = 0; i < NUM_APPS; ++i) {
// g.vault().scheduler.ready(&(apps[i]));

1
kernel/thread/scheduler.h
View File

@@ -42,6 +42,7 @@ class Scheduler {
*/
alignas(16) IdleThread idleThread;
public:
Scheduler();

1
kernel/thread/thread.h
View File

@@ -33,6 +33,7 @@ class Thread {
bool isKernel;
void* start;
pagetable_t* subtable;
friend class Queue<Thread>;

12
user/app1/appl.cc
View File

@@ -13,12 +13,12 @@ extern "C" void main() {
for (unsigned i = 1;; ++i) {
write(1, text, sizeof(text));
if(i==id){
//write(2, "kill", 4);
//write(2, &text[4], 1);
//write(2, " ", 1);
sys_exit();
}
//if(i==id){
// //write(2, "kill", 4);
// //write(2, &text[4], 1);
// //write(2, " ", 1);
// sys_exit();
//}
sleep(1000);
}
}

49
user/app2/kappl.cc
View File

@@ -9,29 +9,30 @@ extern "C" void main() {
char cmd_buff[100];
uint8_t bufferpos = 0;
while(1){
char msg[11];
int len;
len = read(0, msg, 1);
if(len){
write(0, msg, len);
memcpy(&cmd_buff[bufferpos], msg, len);
bufferpos+=len;
for(uint8_t i=0; i<len; i++)
if(msg[i] == '\n'){
bufferpos = 0;
if(strncmp(cmd_buff, "kill ", 5) == 0){
int pid = cmd_buff[5]-0x30;
char r[] = "killing X\n";
r[8] = pid+0x30;
write(0, r, 9);
sys_kill(pid);
}
if(strncmp(cmd_buff, "killall", 7) == 0){
for(uint8_t i = 0; i<10; i++){
sys_kill(i);
}
}
}
}
write(1, "kappl", 5);
//char msg[11];
//int len;
//len = read(0, msg, 1);
//if(len){
// write(0, msg, len);
// memcpy(&cmd_buff[bufferpos], msg, len);
// bufferpos+=len;
// for(uint8_t i=0; i<len; i++)
// if(msg[i] == '\n'){
// bufferpos = 0;
// if(strncmp(cmd_buff, "kill ", 5) == 0){
// int pid = cmd_buff[5]-0x30;
// char r[] = "killing X\n";
// r[8] = pid+0x30;
// write(0, r, 9);
// sys_kill(pid);
// }
// if(strncmp(cmd_buff, "killall", 7) == 0){
// for(uint8_t i = 0; i<10; i++){
// sys_kill(i);
// }
// }
// }
//}
}
}