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

Merge branch 'post-06' into post-07

Browse Source
This commit is contained in:
Philipp Oppermann
2019-03-09 12:32:03 +01:00
parent f5b6094521 b895f8c745
commit be0ed3a54d
4 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/test-exception-breakpoint.rs
View File

@@ -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");

4
src/interrupts.rs
View File

@@ -6,7 +6,7 @@
use crate::{gdt, 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 = {
@@ -25,7 +25,7 @@ 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);
}