diff options
Diffstat (limited to 'src/kernel/task/task.c')
| -rw-r--r-- | src/kernel/task/task.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/kernel/task/task.c b/src/kernel/task/task.c index 7153d85..b8a72ce 100644 --- a/src/kernel/task/task.c +++ b/src/kernel/task/task.c @@ -39,7 +39,7 @@ void tasking_init() { kernel_process->pagedir = kernel_pagedir; kernel_process->next = 0; current_thread = 0; - idle_thread = thread_new(kernel_process, task_idle, 0); + idle_thread = thread_new(kernel_process, task_idle, 0, 0); kernel_process->threads = idle_thread; sti(); monitor_write("[Tasking] "); @@ -99,15 +99,15 @@ void tasking_switch() { Ends the thread for most exceptions, ends the whole process for page faults. */ uint32_t tasking_handleException(struct registers *regs) { if (current_thread == 0) return 0; //No tasking yet - NL; WHERE; monitor_write("Unhandled exception : "); + NL; WHERE; monitor_write("exception:`"); char *exception_messages[] = {"Division By Zero","Debug","Non Maskable Interrupt","Breakpoint", "Into Detected Overflow","Out of Bounds","Invalid Opcode","No Coprocessor", "Double Fault", "Coprocessor Segment Overrun","Bad TSS","Segment Not Present","Stack Fault","General Protection Fault", "Page Fault","Unknown Interrupt","Coprocessor Fault","Alignment Check","Machine Check"}; monitor_write(exception_messages[regs->int_no]); - monitor_write(" eip:"); monitor_writeHex(regs->eip); + monitor_write("'\teip:"); monitor_writeHex(regs->eip); if (regs->eip >= 0xE0000000) { - monitor_write("\n Exception stack trace :"); + monitor_write("\n Exception stack trace :\n"); stack_trace(regs->ebp); PANIC("Kernel error'd."); } @@ -194,10 +194,10 @@ void process_exit(uint32_t retval) { /* For internal use only. This is called when a newly created thread first runs (its address is the value given for EIP). It switches to user mode if necessary and calls the entry point. */ -static void thread_run(struct thread *thread, thread_entry entry_point, void *data) { +static void thread_run(void* u_esp, struct thread *thread, thread_entry entry_point, void *data) { pagedir_switch(thread->process->pagedir); if (thread->process->privilege >= PL_SERVICE) { //User mode ! - uint32_t *stack = (uint32_t*)(thread->userStack_seg->start + thread->userStack_seg->len); + uint32_t *stack = u_esp; stack--; *stack = (uint32_t)data; stack--; *stack = 0; @@ -239,16 +239,13 @@ static void thread_run(struct thread *thread, thread_entry entry_point, void *da /* Creates a new thread for given process. Allocates a kernel stack and a user stack if necessary. Sets up the kernel stack for values to be passed to thread_run. */ -struct thread *thread_new(struct process *proc, thread_entry entry_point, void *data) { +struct thread *thread_new(struct process *proc, thread_entry entry_point, void *data, void *u_esp) { struct thread *t = kmalloc(sizeof(struct thread)); t->process = proc; t->next = 0; proc->thread_count++; - if (proc->privilege >= PL_SERVICE) { //We are running in user mode - proc->stacksBottom -= USER_STACK_SIZE; - t->userStack_seg = seg_map(simpleseg_make(proc->stacksBottom, USER_STACK_SIZE, 1), proc->pagedir, 0); - } + if (u_esp == 0) u_esp = (void*)proc->stack; t->kernelStack_addr = kmalloc(KSTACKSIZE); t->kernelStack_size = KSTACKSIZE; @@ -259,6 +256,7 @@ struct thread *thread_new(struct process *proc, thread_entry entry_point, void * stack--; *stack = (uint32_t)data; stack--; *stack = (uint32_t)entry_point; stack--; *stack = (uint32_t)t; + stack--; *stack = (uint32_t)u_esp; stack--; *stack = 0; t->esp = (uint32_t)stack; t->ebp = t->esp + 8; @@ -287,9 +285,15 @@ struct process *process_new(struct process* parent, uint32_t uid, uint32_t privi p->parent = parent; p->pagedir = pagedir_new(); p->next = processes; - p->stacksBottom = 0xDF000000; p->heapseg = 0; + p->stack = 0; + if (p->privilege >= PL_SERVICE) { //We are running in user mode + size_t stacksBottom = 0xDF000000; + seg_map(simpleseg_make(stacksBottom, USER_STACK_SIZE, 1), p->pagedir, 0); + p->stack = stacksBottom + USER_STACK_SIZE - 4; + } + p->next_objdesc = 0; p->objects = 0; struct object* o = obj_new(p); @@ -318,7 +322,6 @@ static void thread_delete(struct thread *th) { if (current_thread == th) current_thread = 0; th->process->thread_count--; kfree(th->kernelStack_addr); - if (th->userStack_seg != 0) seg_unmap(th->userStack_seg); kfree(th); } |