From c19415d2ffb6f063f91983ff505e2530ab500908 Mon Sep 17 00:00:00 2001 From: Alex AUVOLAT Date: Fri, 18 May 2012 11:10:53 +0200 Subject: Minor changes. --- src/kernel/task/idt.cpp | 6 +++--- src/kernel/task/task.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/kernel/task') diff --git a/src/kernel/task/idt.cpp b/src/kernel/task/idt.cpp index 634350c..3d6d3cb 100644 --- a/src/kernel/task/idt.cpp +++ b/src/kernel/task/idt.cpp @@ -81,9 +81,9 @@ static struct irq_waiter { extern "C" void idt_isrHandler(registers regs) { if ((regs.int_no == 14 && paging_fault(®s) != 0) || regs.int_no != 14) { if (tasking_handleException(®s) == 0) { - ke_vt->writeStr("\nREALLY BAD THIS TIME\t\tUnhandled exception\t#"); - ke_vt->writeDec(regs.int_no); - ke_vt->writeStr("\t@"); ke_vt->writeHex(regs.eip); + *ke_vt << "\nREALLY BAD THIS TIME\t\tUnhandled exception\t#"; + *ke_vt << regs.int_no; + *ke_vt << "\t@" << regs.eip; PANIC("Unhandled Exception"); } } diff --git a/src/kernel/task/task.cpp b/src/kernel/task/task.cpp index e54b96e..e513608 100644 --- a/src/kernel/task/task.cpp +++ b/src/kernel/task/task.cpp @@ -102,18 +102,18 @@ uint32_t tasking_handleException(registers *regs) { "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"}; - ke_vt->writeStr(exception_messages[regs->int_no]); - ke_vt->writeStr("'\teip:"); ke_vt->writeHex(regs->eip); + *ke_vt << exception_messages[regs->int_no]; + *ke_vt << "'\teip:" << regs->eip; if (regs->eip >= K_HIGHHALF_ADDR) { - ke_vt->writeStr("\n Exception stack trace :\n"); + *ke_vt << "\n Exception stack trace :\n"; stack_trace(regs->ebp); PANIC("Kernel error'd."); } if (regs->int_no == 14) { - ke_vt->writeStr("\n>>> Process exiting.\n"); + *ke_vt << "\n>>> Process exiting.\n"; thread_exit_stackJmp(EX_PR_EXCEPTION); } else { - ke_vt->writeStr("\n>>> Thread exiting.\n"); + *ke_vt << "\n>>> Thread exiting.\n"; thread_exit_stackJmp(EX_TH_EXCEPTION); } PANIC("This should never have happened. Please report this."); -- cgit v1.2.3