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

Pass the memory controller to interrupts::init and use it to create a double fault stack

Browse Source
This commit is contained in:
Philipp Oppermann
2017-04-18 18:20:15 +02:00
parent f1459a552c
commit 00bbd6fbc6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/interrupts.rs
View File

@@ -1,4 +1,5 @@
use x86_64::structures::idt::{Idt, ExceptionStackFrame}; use x86_64::structures::idt::{Idt, ExceptionStackFrame};
use memory::MemoryController;
lazy_static! { lazy_static! {
static ref IDT: Idt = { static ref IDT: Idt = {
@@ -9,7 +10,10 @@ lazy_static! {
}; };
} }
pub fn init() { pub fn init(memory_controller: &mut MemoryController) {
let double_fault_stack = memory_controller.alloc_stack(1)
.expect("could not allocate double fault stack");
IDT.load(); IDT.load();
} }

4
src/lib.rs
View File

@@ -42,14 +42,14 @@ pub extern "C" fn rust_main(multiboot_information_address: usize) {
enable_write_protect_bit(); enable_write_protect_bit();
// set up guard page and map the heap pages // set up guard page and map the heap pages
memory::init(boot_info); let mut memory_controller = memory::init(boot_info);
unsafe { unsafe {
HEAP_ALLOCATOR.lock().init(HEAP_START, HEAP_START + HEAP_SIZE); HEAP_ALLOCATOR.lock().init(HEAP_START, HEAP_START + HEAP_SIZE);
} }
// initialize our IDT // initialize our IDT
interrupts::init(); interrupts::init(&mut memory_controller);
for i in 0..10000 { for i in 0..10000 {
format!("Some String"); format!("Some String");