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

Print an empty line before exception error messages

Browse Source
This commit is contained in:
Philipp Oppermann
2016-10-31 01:37:37 +01:00
parent 7254528d53
commit 7a0bb1ff7b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/interrupts/mod.rs
View File

@@ -115,20 +115,20 @@ struct ExceptionStackFrame {
extern "C" fn divide_by_zero_handler(stack_frame: *const ExceptionStackFrame) { extern "C" fn divide_by_zero_handler(stack_frame: *const ExceptionStackFrame) {
let stack_frame = unsafe { &*stack_frame }; let stack_frame = unsafe { &*stack_frame };
println!("EXCEPTION: DIVIDE BY ZERO\n{:#?}", stack_frame); println!("\nEXCEPTION: DIVIDE BY ZERO\n{:#?}", stack_frame);
loop {} loop {}
} }
extern "C" fn breakpoint_handler(stack_frame: *const ExceptionStackFrame) { extern "C" fn breakpoint_handler(stack_frame: *const ExceptionStackFrame) {
let stack_frame = unsafe { &*stack_frame }; let stack_frame = unsafe { &*stack_frame };
println!("EXCEPTION: BREAKPOINT at {:#x}\n{:#?}", println!("\nEXCEPTION: BREAKPOINT at {:#x}\n{:#?}",
stack_frame.instruction_pointer, stack_frame.instruction_pointer,
stack_frame); stack_frame);
} }
extern "C" fn invalid_opcode_handler(stack_frame: *const ExceptionStackFrame) { extern "C" fn invalid_opcode_handler(stack_frame: *const ExceptionStackFrame) {
let stack_frame = unsafe { &*stack_frame }; let stack_frame = unsafe { &*stack_frame };
println!("EXCEPTION: INVALID OPCODE at {:#x}\n{:#?}", println!("\nEXCEPTION: INVALID OPCODE at {:#x}\n{:#?}",
stack_frame.instruction_pointer, stack_frame.instruction_pointer,
*stack_frame); *stack_frame);
loop {} loop {}
@@ -147,7 +147,7 @@ bitflags! {
extern "C" fn page_fault_handler(stack_frame: *const ExceptionStackFrame, error_code: u64) { extern "C" fn page_fault_handler(stack_frame: *const ExceptionStackFrame, error_code: u64) {
let stack_frame = unsafe { &*stack_frame }; let stack_frame = unsafe { &*stack_frame };
use x86::controlregs; use x86::controlregs;
println!("EXCEPTION: PAGE FAULT while accessing {:#x}\nerror code: \ println!("\nEXCEPTION: PAGE FAULT while accessing {:#x}\nerror code: \
{:?}\n{:#?}", {:?}\n{:#?}",
unsafe { controlregs::cr2() }, unsafe { controlregs::cr2() },
PageFaultErrorCode::from_bits(error_code).unwrap(), PageFaultErrorCode::from_bits(error_code).unwrap(),