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

Set a global allocator

Browse Source
This commit is contained in:
Philipp Oppermann
2017-11-19 13:13:18 +01:00
parent 9dc998222a
commit c0d403abbe
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib.rs
View File

@@ -4,6 +4,7 @@
#![feature(const_unique_new, const_atomic_usize_new)] #![feature(const_unique_new, const_atomic_usize_new)]
#![feature(unique)] #![feature(unique)]
#![feature(allocator_api)] #![feature(allocator_api)]
#![feature(global_allocator)]
#![no_std] #![no_std]
@@ -84,3 +85,12 @@ pub extern fn panic_fmt(fmt: core::fmt::Arguments, file: &'static str, line: u32
println!(" {}", fmt); println!(" {}", fmt);
loop{} loop{}
} }
use memory::heap_allocator::BumpAllocator;
pub const HEAP_START: usize = 0o_000_001_000_000_0000;
pub const HEAP_SIZE: usize = 100 * 1024; // 100 KiB
#[global_allocator]
static HEAP_ALLOCATOR: BumpAllocator = BumpAllocator::new(HEAP_START,
HEAP_START + HEAP_SIZE);

2
src/memory/mod.rs
View File

@@ -3,7 +3,7 @@ pub use self::paging::remap_the_kernel;
use self::paging::PhysicalAddress; use self::paging::PhysicalAddress;
mod area_frame_allocator; mod area_frame_allocator;
mod heap_allocator; pub mod heap_allocator;
mod paging; mod paging;
pub const PAGE_SIZE: usize = 4096; pub const PAGE_SIZE: usize = 4096;