michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Add a handler macro that creates wrapper functions

Browse Source
This commit is contained in:
Philipp Oppermann
2016-08-03 16:24:43 +02:00
parent 308b033ea9
commit bf72618647
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/interrupts/mod.rs
View File

@@ -1,10 +1,28 @@
mod idt; mod idt;
macro_rules! handler {
($name: ident) => {{
#[naked]
extern "C" fn wrapper() -> ! {
unsafe {
asm!("mov rdi, rsp
sub rsp, 8 // align the stack pointer
call $0"
:: "i"($name as extern "C" fn(
*const ExceptionStackFrame) -> !)
: "rdi" : "intel");
::core::intrinsics::unreachable();
}
}
wrapper
}}
}
lazy_static! { 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_wrapper); idt.set_handler(0, handler!(divide_by_zero_handler));
idt idt
}; };
@@ -26,18 +44,6 @@ struct ExceptionStackFrame {
use vga_buffer::print_error; use vga_buffer::print_error;
#[naked]
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) extern "C" fn divide_by_zero_handler(stack_frame: *const ExceptionStackFrame)
-> ! -> !
{ {