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

2 apps working

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

17
kernel/thread/thread.cc
View File

@@ -20,7 +20,7 @@ void Thread::kickoff(uintptr_t param1, uintptr_t param2, uintptr_t param3) {
Guard::leave(); Guard::leave();
if(!thread->isKernel) if(!thread->isKernel)
Core::Ring::switchToUsermode(thread->StackPointer.user, thread->start, 0); Core::Ring::switchToUsermode(thread->StackPointer.user, (void*)0x4000000, 0);
else else
if(thread->start == nullptr) if(thread->start == nullptr)
thread->action(); thread->action();
@@ -38,21 +38,24 @@ void Thread::load_paging(Thread* t){
load_cr3((void*)&paging_tree.l4); load_cr3((void*)&paging_tree.l4);
} }
Thread::Thread (bool kernel, void * start): queue_link(nullptr), isKernel(kernel), start(start), id(idCounter++), kill_flag(false){ Thread::Thread (bool kernel, void * startframe, int num_pages): queue_link(nullptr), isKernel(kernel), start(startframe), id(idCounter++), kill_flag(false){
StackPointer.isr = reinterpret_cast<void *>((uintptr_t)PageFrameAllocator::alloc(true)+STACK_SIZE);//(reserved_stack_space_isr + STACK_SIZE); StackPointer.isr = reinterpret_cast<void *>((uintptr_t)PageFrameAllocator::alloc(true)+STACK_SIZE);//(reserved_stack_space_isr + STACK_SIZE);
StackPointer.user = reinterpret_cast<void *>((uintptr_t)PageFrameAllocator::alloc(false)+STACK_SIZE); StackPointer.user = (void*)(0x4100000+STACK_SIZE);
subtable = (pagetable_t*) PageFrameAllocator::alloc(true); subtable = (pagetable_t*) PageFrameAllocator::alloc(true);
subtable->entries[0] = { for(uint8_t i=0; i<num_pages; i++){
subtable->entries[i] = {
.present = 1, .present = 1,
.user = 1, .user = 1,
.address = (uintptr_t)start >> 12 .address = ((uintptr_t)startframe >> 12) + i
}; };
subtable->entries[1] = { }
uintptr_t user_stackframe_p = ((uintptr_t)PageFrameAllocator::alloc(false));
subtable->entries[256] = {
.present = 1, .present = 1,
.write = 1, .write = 1,
.user = 1, .user = 1,
.address = (uintptr_t)StackPointer.user >> 12 .address = user_stackframe_p >> 12
}; };
//map_pageframe(&paging_tree, (uintptr_t)StackPointer.user, 0x4001000); //map_pageframe(&paging_tree, (uintptr_t)StackPointer.user, 0x4001000);

2
kernel/thread/thread.h
View File

@@ -99,7 +99,7 @@ class Thread {
* *
*/ */
explicit Thread(); explicit Thread();
explicit Thread(bool kernel, void * start = nullptr); explicit Thread(bool kernel, void * startframe = nullptr, int num_pages=1);
/*! \brief Activates the first thread on this CPU. /*! \brief Activates the first thread on this CPU.
* *

49
user/app2/kappl.cc
View File

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