Add a wrapper function and print the exception stack frame

This commit is contained in:
Philipp Oppermann
2016-08-03 16:22:59 +02:00
parent 07bef978ad
commit 308b033ea9
2 changed files with 32 additions and 3 deletions

View File

@@ -4,7 +4,7 @@ lazy_static! {
static ref IDT: idt::Idt = { static ref IDT: idt::Idt = {
let mut idt = idt::Idt::new(); let mut idt = idt::Idt::new();
idt.set_handler(0, divide_by_zero_handler); idt.set_handler(0, divide_by_zero_wrapper);
idt idt
}; };
@@ -14,9 +14,36 @@ pub fn init() {
IDT.load(); IDT.load();
} }
#[derive(Debug)]
#[repr(C)]
struct ExceptionStackFrame {
instruction_pointer: u64,
code_segment: u64,
cpu_flags: u64,
stack_pointer: u64,
stack_segment: u64,
}
use vga_buffer::print_error; use vga_buffer::print_error;
extern "C" fn divide_by_zero_handler() -> ! { #[naked]
unsafe { print_error(format_args!("EXCEPTION: DIVIDE BY ZERO")) }; extern "C" fn divide_by_zero_wrapper() -> ! {
unsafe {
asm!("mov rdi, rsp
sub rsp, 8 // align the stack pointer
call $0"
:: "i"(divide_by_zero_handler as extern "C" fn(_) -> !)
: "rdi" : "intel");
::core::intrinsics::unreachable();
}
}
extern "C" fn divide_by_zero_handler(stack_frame: *const ExceptionStackFrame)
-> !
{
unsafe {
print_error(format_args!("EXCEPTION: DIVIDE BY ZERO\n{:#?}",
*stack_frame));
}
loop {} loop {}
} }

View File

@@ -11,6 +11,8 @@
#![feature(const_fn, unique)] #![feature(const_fn, unique)]
#![feature(alloc, collections)] #![feature(alloc, collections)]
#![feature(asm)] #![feature(asm)]
#![feature(naked_functions)]
#![feature(core_intrinsics)]
#![no_std] #![no_std]
extern crate rlibc; extern crate rlibc;