diff options
Diffstat (limited to 'src/kernel/task')
-rw-r--r-- | src/kernel/task/syscall.c | 16 | ||||
-rw-r--r-- | src/kernel/task/task.c | 9 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/kernel/task/syscall.c b/src/kernel/task/syscall.c index 5aab011..8195dd0 100644 --- a/src/kernel/task/syscall.c +++ b/src/kernel/task/syscall.c @@ -1,21 +1,29 @@ #include "syscall.h" +#include "task.h" #define CALL0(name, scname) static void scname(struct registers* r) { r->eax = name(); } #define CALL1(name, scname) static void scname(struct registers* r) { \ r->eax = name(r->ebx); } #define CALL2(name, scname) static void scname(struct registers* r) { \ r->eax = name(r->ebx, r->ecx); } +#define CALL0V(name, scname) static void scname(struct registers* r) { name(); } +#define CALL1V(name, scname) static void scname(struct registers* r) { name(r->ebx); } -CALL0(thread_exit, thread_exit_sc); -CALL0(tasking_switch, schedule_sc); -CALL1(thread_sleep, thread_sleep_sc); -CALL1(process_exit, process_exit_sc); +CALL0V(thread_exit, thread_exit_sc); +CALL0V(tasking_switch, schedule_sc); +CALL1V(thread_sleep, thread_sleep_sc); +CALL1V(process_exit, process_exit_sc); CALL1(monitor_write, printk_sc); +static void thread_new_sc(struct registers* r) { + thread_new(current_thread->process, (thread_entry)r->ebx, (void*)r->ecx); +} + int_callback syscalls[] = { thread_exit_sc, schedule_sc, thread_sleep_sc, process_exit_sc, printk_sc, + thread_new_sc, 0 }; diff --git a/src/kernel/task/task.c b/src/kernel/task/task.c index a37d44b..8cdf7b3 100644 --- a/src/kernel/task/task.c +++ b/src/kernel/task/task.c @@ -107,8 +107,13 @@ uint32_t tasking_handleException(struct registers *regs) { "Page Fault","Unknown Interrupt","Coprocessor Fault","Alignment Check","Machine Check"}; monitor_write(exception_messages[regs->int_no]); monitor_write(" at "); monitor_writeHex(regs->eip); - monitor_write("\n>>> Thread exiting.\n"); - thread_exit_stackJmp(EX_TH_EXCEPTION); + if (regs->int_no == 14) { + monitor_write("\n>>> Process exiting.\n"); + thread_exit_stackJmp(EX_PR_EXCEPTION); + } else { + monitor_write("\n>>> Thread exiting.\n"); + thread_exit_stackJmp(EX_TH_EXCEPTION); + } PANIC("This should never have happened. Please report this."); } |