From dfa1cc48c93b73a182b0cbfcc22c0a24027cb534 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Mon, 2 Jan 2017 15:35:06 +0100 Subject: [PATCH] Add a double fault handler (and trigger it) --- src/interrupts/mod.rs | 6 ++++++ src/lib.rs | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/interrupts/mod.rs b/src/interrupts/mod.rs index 6556236e..c0232760 100644 --- a/src/interrupts/mod.rs +++ b/src/interrupts/mod.rs @@ -93,6 +93,7 @@ lazy_static! { idt.set_handler(0, handler!(divide_by_zero_handler)); idt.set_handler(3, handler!(breakpoint_handler)); idt.set_handler(6, handler!(invalid_opcode_handler)); + idt.set_handler(8, handler_with_error_code!(double_fault_handler)); idt.set_handler(14, handler_with_error_code!(page_fault_handler)); idt @@ -150,3 +151,8 @@ extern "C" fn page_fault_handler(stack_frame: &ExceptionStackFrame, error_code: stack_frame); loop {} } + +extern "C" fn double_fault_handler(stack_frame: &ExceptionStackFrame, _error_code: u64) { + println!("\nEXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame); + loop {} +} diff --git a/src/lib.rs b/src/lib.rs index 441b2e5f..6a8ca74f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -56,8 +56,8 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) { // initialize our IDT interrupts::init(); - // trigger a breakpoint exception - unsafe { int!(3) }; + // trigger a debug exception + unsafe { int!(1) }; println!("It did not crash!"); loop {}