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

create copys of appcode in thread constructor

Browse Source
This commit is contained in:
Eggert Jung
2026-02-28 18:01:15 +01:00
parent 1acc652446
commit 4976ea91be
9 changed files with 265 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
kernel/syscall/skeleton.cc
View File

@@ -145,7 +145,7 @@ namespace Syscall {
//pagetable_t* subbytable = vault->scheduler.active()->subtable;
four_lvl_paging_t* search_table = vault->scheduler.active()->paging_tree;
void* ptr = getFreeVirtSpace(search_table, num_pages);
void* ptr = getFreeVirtSpace(search_table->l4, num_pages);
if (ptr == nullptr) {
return nullptr;
}
@@ -154,7 +154,7 @@ namespace Syscall {
for (size_t i = 0; i < num_pages; ++i) {
// allocate each page with allocator
void* frame = PageFrameAllocator::alloc(false);
setMapping((uintptr_t)ptr, frame, search_table);
setMapping((uintptr_t)ptr, frame, search_table->l4);
}
return ptr;
}
@@ -166,8 +166,8 @@ namespace Syscall {
memset(start, 0, size);
for(uint32_t i=startIndex; i<(startIndex+NumberOfPages); i++){
uintptr_t frame = isMapped(i<<12, search_table);
setMapping(i<<12, 0, search_table);
uintptr_t frame = isMapped(i<<12, search_table->l4);
setMapping(i<<12, 0, search_table->l4);
PageFrameAllocator::free(frame);
invlpg(i<<12);
}
@@ -180,17 +180,18 @@ bool copy_from_phys(Vault& vault, uintptr_t phys_ptr, void* virt_ptr, size_t siz
size_t total_size = size + offset;
four_lvl_paging_t* search_table = vault.scheduler.active()->paging_tree;
void* virt_addr = getFreeVirtSpace(search_table, (total_size/4096)+1); // page aligned pointer
void* virt_addr = getFreeVirtSpace(search_table->l4, (total_size/4096)+1); // page aligned pointer
if (virt_addr == nullptr) {
return false;
}
for(uint8_t i =0; i<size/4096 +1; i++){
setMapping((uintptr_t)virt_addr, (void*)phys_ptr, vault.scheduler.active()->paging_tree);
//TODO actually use loop
setMapping((uintptr_t)virt_addr, (void*)phys_ptr, vault.scheduler.active()->paging_tree->l4);
}
memcpy(virt_ptr, (void*)((uintptr_t)(virt_addr)+ (uintptr_t)offset), size);
setMapping((uintptr_t)(virt_addr), 0, search_table);
setMapping((uintptr_t)(virt_addr), 0, search_table->l4);
return true;
}
@@ -201,7 +202,7 @@ bool send(Vault& v, int pid, const void* sbuffer, size_t ssize, void* rbuffer, s
Thread* current_thread = v.scheduler.active();
Thread* target_thread = v.thread_list[pid];
uintptr_t sbuffer_ptr = isMapped((uintptr_t)sbuffer,v.scheduler.active()->paging_tree) + ((uintptr_t)sbuffer&0xFFF);
uintptr_t sbuffer_ptr = isMapped((uintptr_t)sbuffer,v.scheduler.active()->paging_tree->l4) + ((uintptr_t)sbuffer&0xFFF);
IpcStruct msg {
.ptr = sbuffer_ptr,
.size = ssize,
@@ -267,7 +268,7 @@ bool reply(Vault& v, const void* buffer, size_t size) {
Thread* other_thread = v.thread_list[ipc->pid];
if (other_thread == nullptr) return false;
uintptr_t phys_ptr = isMapped((uintptr_t)buffer, current_thread->paging_tree );
uintptr_t phys_ptr = isMapped((uintptr_t)buffer, current_thread->paging_tree->l4 );
ipc->ptr = phys_ptr + ((uintptr_t)buffer & 0xFFF);
ipc->size = size;
ipc->pid = current_thread->id;
@@ -280,19 +281,19 @@ bool reply(Vault& v, const void* buffer, size_t size) {
}
void copy_stack(Thread* parent, Thread* child){
uintptr_t dest_frame = isMapped((uintptr_t)child->StackPointer.user, child->paging_tree);
void* dest_vaddr = getFreeVirtSpace(parent->paging_tree, 1);
setMapping((uintptr_t)dest_vaddr, (void*)dest_frame, parent->paging_tree);
uintptr_t dest_frame = isMapped((uintptr_t)child->StackPointer.user, child->paging_tree->l4);
void* dest_vaddr = getFreeVirtSpace(parent->paging_tree->l4, 1);
setMapping((uintptr_t)dest_vaddr, (void*)dest_frame, parent->paging_tree->l4);
memcpy(dest_vaddr, (void*)0x6000000/*((uintptr_t)parent->StackPointer.user & ~0xFFF)*/, 4096);
setMapping((uintptr_t)dest_vaddr, 0, parent->paging_tree);
setMapping((uintptr_t)dest_vaddr, 0, parent->paging_tree->l4);
}
int fork(Vault &vault, InterruptContext *user_context) {
Thread* parent = vault.scheduler.active();
Thread* child = new Thread(false, (void*)user_context->ip, parent->code_paddr, parent->code_pagenum);
copy_pagetable(parent->paging_tree, child->paging_tree);
//copy_pagetable(parent->paging_tree, child->paging_tree);
copy_stack(parent, child);
child->StackPointer.user = (void*)user_context->sp;