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

Use linked_list_allocator crate instead of dummy allocator

Browse Source
This commit is contained in:
Philipp Oppermann
2019-06-26 15:05:57 +02:00
parent 06fc63028a
commit d7484ab48b
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/allocator.rs
View File

@@ -30,6 +30,10 @@ pub fn init_heap(
unsafe { mapper.map_to(page, frame, flags, frame_allocator)?.flush() };
}
unsafe {
super::ALLOCATOR.lock().init(HEAP_START, HEAP_SIZE);
}
Ok(())
}

3
src/lib.rs
View File

@@ -9,6 +9,7 @@
extern crate alloc;
use core::panic::PanicInfo;
use linked_list_allocator::LockedHeap;
pub mod allocator;
pub mod gdt;
@@ -18,7 +19,7 @@ pub mod serial;
pub mod vga_buffer;
#[global_allocator]
static ALLOCATOR: allocator::Dummy = allocator::Dummy;
static ALLOCATOR: LockedHeap = LockedHeap::empty();
pub fn init() {
gdt::init();