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

Rewrite interrupts::init using a lazy_static IDT again

Browse Source
This commit is contained in:
Philipp Oppermann
2016-12-28 16:21:33 +01:00
parent 3e6b1a8a35
commit 0b03c18b06
1 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/interrupts/mod.rs
View File

@@ -91,52 +91,54 @@ macro_rules! handler_with_error_code {
}} }}
} }
static IDT: Once<idt::Idt> = Once::new(); lazy_static! {
static TSS: Once<TaskStateSegment> = Once::new(); static ref IDT: idt::Idt = {
static GDT: Once<gdt::Gdt> = Once::new();
pub fn init(memory_controller: &mut MemoryController) {
let double_fault_stack = memory_controller.alloc_stack(1)
.expect("could not allocate double fault stack");
const DOUBLE_FAULT_IST_INDEX: u8 = 0;
let tss = TSS.call_once(|| {
let mut tss = TaskStateSegment::new();
tss.ist[DOUBLE_FAULT_IST_INDEX as usize] = double_fault_stack.top() as u64;
tss
});
let mut code_selector = gdt::Selector::new();
let mut data_selector = gdt::Selector::new();
let mut tss_selector = gdt::Selector::new();
let gdt = GDT.call_once(|| {
let mut gdt = gdt::Gdt::new();
code_selector = gdt.add_entry(gdt::Entry::code_segment());
data_selector = gdt.add_entry(gdt::Entry::data_segment());
tss_selector = gdt.add_entry(gdt::Entry::tss_segment(tss));
gdt
});
gdt.load();
gdt::reload_segment_registers(code_selector, data_selector);
unsafe { gdt::load_ltr(tss_selector) };
let idt = IDT.call_once(|| {
let mut idt = idt::Idt::new(); let mut idt = idt::Idt::new();
idt.set_handler(0, handler!(divide_by_zero_handler)); idt.set_handler(0, handler!(divide_by_zero_handler));
idt.set_handler(3, handler!(breakpoint_handler)); idt.set_handler(3, handler!(breakpoint_handler));
idt.set_handler(6, handler!(invalid_opcode_handler)); idt.set_handler(6, handler!(invalid_opcode_handler));
idt.set_handler(8, handler_with_error_code!(double_fault_handler)) idt.set_handler(8, handler_with_error_code!(double_fault_handler))
.set_stack_index(DOUBLE_FAULT_IST_INDEX); .set_stack_index(DOUBLE_FAULT_IST_INDEX as u8);
idt.set_handler(14, handler_with_error_code!(page_fault_handler)); idt.set_handler(14, handler_with_error_code!(page_fault_handler));
idt idt
};
}
static TSS: Once<TaskStateSegment> = Once::new();
static GDT: Once<gdt::Gdt> = Once::new();
const DOUBLE_FAULT_IST_INDEX: usize = 0;
pub fn init(memory_controller: &mut MemoryController) {
use x86::shared::segmentation::{SegmentSelector, set_cs};
use x86::shared::task::load_tr;
let double_fault_stack = memory_controller.alloc_stack(1)
.expect("could not allocate double fault stack");
let tss = TSS.call_once(|| {
let mut tss = TaskStateSegment::new();
tss.ist[DOUBLE_FAULT_IST_INDEX] = double_fault_stack.top() as u64;
tss
}); });
idt.load(); let mut code_selector = SegmentSelector::empty();
let mut tss_selector = SegmentSelector::empty();
let gdt = GDT.call_once(|| {
let mut gdt = gdt::Gdt::new();
tss_selector = gdt.add_entry(gdt::Descriptor::tss_segment(&tss));
code_selector = gdt.add_entry(gdt::Descriptor::kernel_code_segment());
gdt
});
gdt.load();
unsafe {
set_cs(code_selector);
load_tr(tss_selector);
}
IDT.load();
} }
#[derive(Debug)] #[derive(Debug)]