Replace allocator with static_alloc crate

hermit-os · May 13, 2022 · 8d3e622 · 8d3e622
1 parent 9868268
commit 8d3e622
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 78 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
 [dependencies]
 bitflags = "1.3"
 goblin = { version = "0.4", default-features = false, features = ["elf64", "elf32", "endian_fd"] }
+static-alloc = "0.2"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies]
 multiboot = "0.7"

diff --git a/src/allocator.rs b/src/allocator.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -18,14 +18,23 @@ extern crate bitflags;
 #[macro_use]
 pub mod macros;
 
-pub mod allocator;
 pub mod arch;
 pub mod console;
 pub mod kernel;
 mod runtime_glue;
 
 use core::ptr;
 
+use static_alloc::Bump;
+
+/// A simple bump memory allocator using static storage.
+/// 
+/// This allocator is used for bootstrapping.
+/// It manages a slice of uninitialized memory and cannot deallocate.
+/// The kernel will setup a proper memory allocator later.
+#[global_allocator]
+static ALLOCATOR: Bump<[u8; 2 * 1024 * 1024]> = Bump::uninit();
+
 // FUNCTIONS
 pub unsafe fn sections_init() {
 	extern "C" {