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

Remove print_error and use normal println in exception handlers

Browse Source
This commit is contained in:
Philipp Oppermann
2016-10-26 09:08:27 +02:00
parent 212dcfa592
commit 9b83b2853e
2 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/interrupts/mod.rs
View File

@@ -113,29 +113,24 @@ struct ExceptionStackFrame {
stack_segment: u64,
}
use vga_buffer::print_error;
extern "C" fn divide_by_zero_handler(stack_frame: *const ExceptionStackFrame) {
unsafe {
print_error(format_args!("EXCEPTION: DIVIDE BY ZERO\n{:#?}", *stack_frame));
}
let stack_frame = unsafe { &*stack_frame };
println!("EXCEPTION: DIVIDE BY ZERO\n{:#?}", stack_frame);
loop {}
}
extern "C" fn breakpoint_handler(stack_frame: *const ExceptionStackFrame) {
unsafe {
print_error(format_args!("EXCEPTION: BREAKPOINT at {:#x}\n{:#?}",
(*stack_frame).instruction_pointer,
*stack_frame));
}
let stack_frame = unsafe { &*stack_frame };
println!("EXCEPTION: BREAKPOINT at {:#x}\n{:#?}",
stack_frame.instruction_pointer,
stack_frame);
}
extern "C" fn invalid_opcode_handler(stack_frame: *const ExceptionStackFrame) {
unsafe {
print_error(format_args!("EXCEPTION: INVALID OPCODE at {:#x}\n{:#?}",
(*stack_frame).instruction_pointer,
*stack_frame));
}
let stack_frame = unsafe { &*stack_frame };
println!("EXCEPTION: INVALID OPCODE at {:#x}\n{:#?}",
stack_frame.instruction_pointer,
*stack_frame);
loop {}
}
@@ -150,13 +145,12 @@ bitflags! {
}
extern "C" fn page_fault_handler(stack_frame: *const ExceptionStackFrame, error_code: u64) {
let stack_frame = unsafe { &*stack_frame };
use x86::controlregs;
unsafe {
print_error(format_args!("EXCEPTION: PAGE FAULT while accessing {:#x}\nerror code: \
println!("EXCEPTION: PAGE FAULT while accessing {:#x}\nerror code: \
{:?}\n{:#?}",
controlregs::cr2(),
PageFaultErrorCode::from_bits(error_code).unwrap(),
*stack_frame));
}
unsafe { controlregs::cr2() },
PageFaultErrorCode::from_bits(error_code).unwrap(),
stack_frame);
loop {}
}

11
src/vga_buffer.rs
View File

@@ -43,17 +43,6 @@ pub fn clear_screen() {
}
}
pub fn print_error(fmt: fmt::Arguments) {
use core::fmt::Write;
use core::mem;
let mut writer = WRITER.lock();
let red = ColorCode::new(Color::Red, Color::Black);
let default_color = mem::replace(&mut writer.color_code, red);
writer.write_fmt(fmt).unwrap();
writer.color_code = default_color;
}
#[allow(dead_code)]
#[derive(Debug, Clone, Copy)]
#[repr(u8)]