From b895f8c745998a396d19c9ada8185bcc2c83af56 Mon Sep 17 00:00:00 2001
From: Philipp Oppermann <dev@phil-opp.com>
Date: Sat, 9 Mar 2019 12:12:28 +0100
Subject: [PATCH] Update code for changes in x86_64 0.5.0

---
 src/bin/test-exception-breakpoint.rs | 2 +-
 src/interrupts.rs                    | 4 ++--
 src/main.rs                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/test-exception-breakpoint.rs b/src/bin/test-exception-breakpoint.rs
index c6bf114a..0185aee6 100644
--- 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
index ffe400fd..745de3dc 100644
--- 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
index ad1e2f7d..b796f0ac 100644
--- 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 {}