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-07' into post-08

Browse Source
This commit is contained in:
Philipp Oppermann
2019-03-09 12:36:39 +01:00
parent 7b61da94a0 8e5b6a3e3f
commit 81e4eec055
5 changed files with 51 additions and 9 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");

2
src/bin/test-exception-double-fault-stack-overflow.rs
View File

@@ -45,7 +45,7 @@ fn panic(info: &PanicInfo) -> ! {
loop {}
}
use x86_64::structures::idt::{ExceptionStackFrame, InterruptDescriptorTable};
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
lazy_static! {
static ref TEST_IDT: InterruptDescriptorTable = {

6
src/interrupts.rs
View File

@@ -8,7 +8,7 @@ use crate::{gdt, hlt_loop, print, println};
use lazy_static::lazy_static;
use pic8259_simple::ChainedPics;
use spin;
use x86_64::structures::idt::{ExceptionStackFrame, InterruptDescriptorTable};
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
pub const PIC_1_OFFSET: u8 = 32;
pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
@@ -52,12 +52,12 @@ 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);
}
extern "x86-interrupt" fn double_fault_handler(
stack_frame: &mut ExceptionStackFrame,
stack_frame: &mut InterruptStackFrame,
_error_code: u64,
) {
println!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);