From 56b399a7d79a36304a93adab67220ae2af1b93a9 Mon Sep 17 00:00:00 2001 From: Nick Shipp Date: Mon, 1 Oct 2018 21:41:35 -0400 Subject: Switch to uefi-rs --- bunny/src/interrupt.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'bunny/src/interrupt.rs') diff --git a/bunny/src/interrupt.rs b/bunny/src/interrupt.rs index 4ac8192..a79e4ed 100644 --- a/bunny/src/interrupt.rs +++ b/bunny/src/interrupt.rs @@ -9,59 +9,59 @@ pub const IRQ_APIC_LVT_ERROR: u8 = 0x20; static mut IDT: InterruptDescriptorTable = InterruptDescriptorTable::new(); extern "x86-interrupt" fn handle_divzero(exc: &mut ExceptionStackFrame) { - println!("DIVISION BY ZERO: {:x?}", exc); + error!("DIVISION BY ZERO: {:x?}", exc); loop {} } extern "x86-interrupt" fn handle_seg_not_present(exc: &mut ExceptionStackFrame, code: u64) { - println!("SEGMENT NOT PRESENT 0x{:x}: {:x?}", code, exc); + error!("SEGMENT NOT PRESENT 0x{:x}: {:x?}", code, exc); } extern "x86-interrupt" fn handle_ss_fault(exc: &mut ExceptionStackFrame, code: u64) { - println!("STACK SEGMENT FAULT 0x{:x}: {:x?}", code, exc); + error!("STACK SEGMENT FAULT 0x{:x}: {:x?}", code, exc); loop {} } extern "x86-interrupt" fn handle_gp(exc: &mut ExceptionStackFrame, code: u64) { - println!("GENERAL PROTECTION FAULT 0x{:x}: {:x?}", code, exc); + error!("GENERAL PROTECTION FAULT 0x{:x}: {:x?}", code, exc); loop {} } extern "x86-interrupt" fn handle_iopc(exc: &mut ExceptionStackFrame) { - println!("INVALID OPCODE @ 0x{:x}: {:x?}", exc.instruction_pointer.as_u64(), exc); + error!("INVALID OPCODE @ 0x{:x}: {:x?}", exc.instruction_pointer.as_u64(), exc); loop {} } extern "x86-interrupt" fn handle_pagefault(exc: &mut ExceptionStackFrame, code: PageFaultErrorCode) { - println!("PAGE FAULT {:?}: {:x?}", code, exc); + error!("PAGE FAULT {:?}: {:x?}", code, exc); loop {} } extern "x86-interrupt" fn handle_inval_tss(exc: &mut ExceptionStackFrame, code: u64) { - println!("INVALID TSS 0x{:x}: {:x?}", code, exc); + error!("INVALID TSS 0x{:x}: {:x?}", code, exc); loop {} } extern "x86-interrupt" fn handle_doublefault(exc: &mut ExceptionStackFrame, code: u64) { - println!("DOUBLE FAULT 0x{:x}: {:x?}", code, exc); + error!("DOUBLE FAULT 0x{:x}: {:x?}", code, exc); loop {} } extern "x86-interrupt" fn handle_mce(exc: &mut ExceptionStackFrame) { - println!("MACHINE CHECK EXCEPTION: {:x?}", exc); + error!("MACHINE CHECK EXCEPTION: {:x?}", exc); loop {} } extern "x86-interrupt" fn handle_breakpoint(exc: &mut ExceptionStackFrame) { - println!("BREAKPOINT AT 0x{:x}: {:x?}", exc.instruction_pointer.as_u64(), exc); + error!("BREAKPOINT AT 0x{:x}: {:x?}", exc.instruction_pointer.as_u64(), exc); } extern "x86-interrupt" fn handle_apic_error(exc: &mut ExceptionStackFrame) { - println!("APIC ERROR AT 0x{:x}: {:x?}", exc.instruction_pointer.as_u64(), exc); + error!("APIC ERROR AT 0x{:x}: {:x?}", exc.instruction_pointer.as_u64(), exc); } fn unhandled_irq(exc: &mut ExceptionStackFrame, num: u8) { - println!("UNHANDLED IRQ#{:02x}h: {:x?}", num, exc); + error!("UNHANDLED IRQ#{:02x}h: {:x?}", num, exc); } -- cgit v1.2.3-54-g00ecf