michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 14:27:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'post-08' into post-09

Browse Source
This commit is contained in:
Philipp Oppermann
2019-11-22 16:33:23 +01:00
parent 385004cab2 723776f852
commit a65573b061
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/interrupts.rs
View File

@@ -4,7 +4,7 @@
// problem we skip compilation of this module on Windows. // problem we skip compilation of this module on Windows.
#![cfg(not(windows))] #![cfg(not(windows))]
use crate::{gdt, hlt_loop, print, println}; use crate::{gdt, print, println};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use pic8259_simple::ChainedPics; use pic8259_simple::ChainedPics;
use spin; use spin;
@@ -74,8 +74,7 @@ extern "x86-interrupt" fn double_fault_handler(
stack_frame: &mut InterruptStackFrame, stack_frame: &mut InterruptStackFrame,
_error_code: u64, _error_code: u64,
) { ) {
println!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame); panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
hlt_loop();
} }
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) { extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: &mut InterruptStackFrame) {