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-09' into post-10

Browse Source
This commit is contained in:
Philipp Oppermann
2019-12-10 17:17:53 +01:00
parent c1fc7171fb 94aa2c4093
commit f226ba0c3f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interrupts.rs
View File

@@ -67,7 +67,7 @@ extern "x86-interrupt" fn page_fault_handler(
extern "x86-interrupt" fn double_fault_handler( extern "x86-interrupt" fn double_fault_handler(
stack_frame: &mut InterruptStackFrame, stack_frame: &mut InterruptStackFrame,
_error_code: u64, _error_code: u64,
) { ) -> ! {
panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame); panic!("EXCEPTION: DOUBLE FAULT\n{:#?}", stack_frame);
} }

2
tests/stack_overflow.rs
View File

@@ -45,7 +45,7 @@ pub fn init_test_idt() {
extern "x86-interrupt" fn test_double_fault_handler( extern "x86-interrupt" fn test_double_fault_handler(
_stack_frame: &mut InterruptStackFrame, _stack_frame: &mut InterruptStackFrame,
_error_code: u64, _error_code: u64,
) { ) -> ! {
serial_println!("[ok]"); serial_println!("[ok]");
exit_qemu(QemuExitCode::Success); exit_qemu(QemuExitCode::Success);
loop {} loop {}