Update code for changes in x86_64 0.5.0

phil-opp · Mar 9, 2019 · b895f8c · b895f8c
1 parent eee9d7b
commit b895f8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/bin/test-exception-breakpoint.rs b/src/bin/test-exception-breakpoint.rs
@@ -10,7 +10,7 @@ use core::panic::PanicInfo;
 pub extern "C" fn _start() -> ! {
     blog_os::interrupts::init_idt();
 
-    x86_64::instructions::int3();
+    x86_64::instructions::interrupts::int3();
 
     serial_println!("ok");
 

diff --git a/src/interrupts.rs b/src/interrupts.rs
@@ -6,7 +6,7 @@
 
 use crate::println;
 use lazy_static::lazy_static;
-use x86_64::structures::idt::{ExceptionStackFrame, InterruptDescriptorTable};
+use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
 
 lazy_static! {
     static ref IDT: InterruptDescriptorTable = {
@@ -20,6 +20,6 @@ pub fn init_idt() {
     IDT.load();
 }
 
-extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut ExceptionStackFrame) {
+extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) {
     println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
 }
diff --git a/src/main.rs b/src/main.rs
@@ -13,7 +13,7 @@ pub extern "C" fn _start() -> ! {
     blog_os::interrupts::init_idt();
 
     // invoke a breakpoint exception
-    x86_64::instructions::int3();
+    x86_64::instructions::interrupts::int3();
 
     println!("It did not crash!");
     loop {}