From 09dd68a1a20468ce644ef79ae1e24466a7c808d7 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Sat, 9 Mar 2019 12:37:45 +0100 Subject: [PATCH] Update post-08 code for changes in x86_64 0.5.0 --- src/bin/test-exception-double-fault-stack-overflow.rs | 2 +- src/interrupts.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/test-exception-double-fault-stack-overflow.rs b/src/bin/test-exception-double-fault-stack-overflow.rs index fa5a227f..51d24755 100644 --- a/src/bin/test-exception-double-fault-stack-overflow.rs +++ b/src/bin/test-exception-double-fault-stack-overflow.rs @@ -65,7 +65,7 @@ pub fn init_test_idt() { } extern "x86-interrupt" fn double_fault_handler( - _stack_frame: &mut ExceptionStackFrame, + _stack_frame: &mut InterruptStackFrame, _error_code: u64, ) { serial_println!("ok"); diff --git a/src/interrupts.rs b/src/interrupts.rs index c1faa255..05c31ef7 100644 --- a/src/interrupts.rs +++ b/src/interrupts.rs @@ -64,7 +64,7 @@ extern "x86-interrupt" fn double_fault_handler( hlt_loop(); } -extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut ExceptionStackFrame) { +extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) { print!("."); unsafe { PICS.lock() @@ -72,7 +72,7 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut ExceptionSt } } -extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut ExceptionStackFrame) { +extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: &mut InterruptStackFrame) { use pc_keyboard::{layouts, DecodedKey, Keyboard, ScancodeSet1}; use spin::Mutex; use x86_64::instructions::port::Port;