diff options
Diffstat (limited to 'src/kernel/task/task.cpp')
| -rw-r--r-- | src/kernel/task/task.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/kernel/task/task.cpp b/src/kernel/task/task.cpp index 3998bfe..e54b96e 100644 --- a/src/kernel/task/task.cpp +++ b/src/kernel/task/task.cpp @@ -1,12 +1,13 @@ #include "task.h" #include "sched.h" #include <core/sys.h> -#include <core/monitor.h> #include <lib/cpp.h> #include <mem/seg.h> #include <mem/gdt.h> #include "timer.h" +#include <ui/vt.h> + #define KSTACKSIZE 0x8000 //Static routines for handling threads exiting and all cleanup @@ -39,7 +40,6 @@ void tasking_init() { current_thread = 0; idle_thread = new thread(kernel_process, task_idle, 0, 0); sti(); - monitor_write("[Tasking] "); } /* Called by the paging functions when a page table is allocated in the kernel space (>K_HIGHHALF_ADDR). @@ -97,23 +97,23 @@ void schedule() { Ends the thread for most exceptions, ends the whole process for page faults. */ uint32_t tasking_handleException(registers *regs) { if (current_thread == 0) return 0; //No tasking yet - NL; WHERE; monitor_write("exception:`"); + NL; WHERE; ke_vt->writeStr("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("'\teip:"); monitor_writeHex(regs->eip); + ke_vt->writeStr(exception_messages[regs->int_no]); + ke_vt->writeStr("'\teip:"); ke_vt->writeHex(regs->eip); if (regs->eip >= K_HIGHHALF_ADDR) { - monitor_write("\n Exception stack trace :\n"); + ke_vt->writeStr("\n Exception stack trace :\n"); stack_trace(regs->ebp); PANIC("Kernel error'd."); } if (regs->int_no == 14) { - monitor_write("\n>>> Process exiting.\n"); + ke_vt->writeStr("\n>>> Process exiting.\n"); thread_exit_stackJmp(EX_PR_EXCEPTION); } else { - monitor_write("\n>>> Thread exiting.\n"); + ke_vt->writeStr("\n>>> Thread exiting.\n"); thread_exit_stackJmp(EX_TH_EXCEPTION); } PANIC("This should never have happened. Please report this."); @@ -372,11 +372,11 @@ size_t process_sbrk(size_t size) { ret = p->data; p->data += size; } - /* (DBG) monitor_write("(sbrk "); - monitor_writeHex(size); - monitor_write(" "); - monitor_writeHex(ret); - monitor_write(")"); */ + /* (DBG) ke_vt->writeStr("(sbrk "); + ke_vt->writeHex(size); + ke_vt->writeStr(" "); + ke_vt->writeHex(ret); + ke_vt->writeStr(")"); */ return ret; } |