diff --git a/kernel/main.cc b/kernel/main.cc index 6b51ecb..2bcbe27 100644 --- a/kernel/main.cc +++ b/kernel/main.cc @@ -93,14 +93,17 @@ extern "C" int main() { DBG << "app " << i << " size " << appsize << " at " << appstart << endl; Thread* thread_ptr= new Thread(false, (void*)appstart, (appsize/4096)+1); //TODO fix edgecase on size=4096 + g.vault().thread_list[thread_ptr->id] = thread_ptr; g.vault().scheduler.ready(thread_ptr); //TODO fix edgecase on size=4096 offset += 1+(appsize/4096); - g.vault().thread_list[thread_ptr->id] = thread_ptr; } + + Thread* thread_ptr = new Thread(false, (void*)0x4001000, 2); + g.vault().scheduler.ready(thread_ptr); + g.vault().thread_list[thread_ptr->id] = thread_ptr; - g.vault().scheduler.ready(new Thread(false, (void*)0x4001000, 2)); //for(void* p=Multiboot::getModule(0)->getStartAddress(); pgetEndAddress(); p=(void*)((uintptr_t)p+4096)){ // DBG << "module at: " << hex << p << endl; // g.vault().scheduler.ready(new Thread(false, p)); diff --git a/kernel/syscall/skeleton.cc b/kernel/syscall/skeleton.cc index 71d466a..c314a25 100644 --- a/kernel/syscall/skeleton.cc +++ b/kernel/syscall/skeleton.cc @@ -293,18 +293,17 @@ 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* page_ptr = getFreeVirtSpace(search_table, total_size); // page aligned pointer - if (page_ptr == nullptr) { + void* virt_addr = getFreeVirtSpace(search_table, (total_size/4096)+1); // page aligned pointer + if (virt_addr == nullptr) { return false; } - uintptr_t virt_addr = (uintptr_t)(page_ptr) + offset; - for(uint8_t i =0; ipaging_tree); + for(uint8_t i =0; ipaging_tree); } - memcpy(virt_ptr, (void*)(virt_addr), size); - PageFrameAllocator::free((uintptr_t)(page_ptr)); + memcpy(virt_ptr, (void*)((uintptr_t)(virt_addr)+ (uintptr_t)offset), size); + PageFrameAllocator::free((uintptr_t)(virt_addr)); return true; } @@ -315,11 +314,17 @@ 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_ptr = isMapped((uintptr_t)sbuffer,v.scheduler.active()->paging_tree) + ((uintptr_t)sbuffer&0xFFF); +IpcStruct msg { + .ptr = sbuffer_ptr, + .size = ssize, + .pid = current_thread->id, + .is_answer = false, + .queue_link = nullptr +}; + + - // Erstelle Nachichtenobjekt - IpcStruct msg = {sbuffer_ptr, ssize, current_thread->id, false, nullptr}; - target_thread->ipc_queue.enqueue(msg); target_thread->ipc_sem.v(v); @@ -370,9 +375,8 @@ 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 = (uintptr_t) current_thread->paging_tree; - - ipc->ptr = phys_ptr; + uintptr_t phys_ptr = isMapped((uintptr_t)buffer, current_thread->paging_tree ); + ipc->ptr = phys_ptr + ((uintptr_t)buffer & 0xFFF); ipc->size = size; ipc->pid = current_thread->id; ipc->is_answer = true; diff --git a/kernel/thread/thread.cc b/kernel/thread/thread.cc index 61f5e35..ab2cc71 100644 --- a/kernel/thread/thread.cc +++ b/kernel/thread/thread.cc @@ -78,6 +78,8 @@ Thread::Thread (bool kernel, void * startframe, int num_pages): queue_link(null .address = (uintptr_t)(appstack_table) >> 12 }; + + prepareContext(StackPointer.isr, context, kickoff, reinterpret_cast(this), 0, 0); } diff --git a/kernel/thread/thread.h b/kernel/thread/thread.h index 4d07572..49b0544 100644 --- a/kernel/thread/thread.h +++ b/kernel/thread/thread.h @@ -21,7 +21,7 @@ #include "../memory/pagetable.h" /// Stack size for each thread -constexpr uint32_t STACK_SIZE = 3072; +constexpr uint32_t STACK_SIZE = 3472; struct IpcStruct { diff --git a/user/app1/appl.cc b/user/app1/appl.cc index 8f1067c..8cd7168 100644 --- a/user/app1/appl.cc +++ b/user/app1/appl.cc @@ -55,12 +55,12 @@ extern "C" void main() { for (unsigned i = 1;; ++i) { if(id == 2){ send(4, text, strlen(text), text, 5); - write(1, text, strlen(text), 15, (int)id); + write(1, text, strlen(text), 25, (int)id); } if(id == 4){ char blubb[10]; receive(blubb, 10); - write(1, blubb, strlen(blubb), 15, (int)id); + write(1, blubb, strlen(blubb), 25, (int)id); reply("toast", 5); }