Merge #66

66: Move allocator module to crate root r=mkroening a=mkroening



Co-authored-by: Martin Kröning <[email protected]>

src/mm/allocator.rs → src/allocator.rs

@@ -10,6 +10,9 @@
 use core::alloc::GlobalAlloc;
 use core::alloc::Layout;
 
+#[global_allocator]
+static ALLOCATOR: Allocator = Allocator;
+
 /// Size of the preallocated space for the Bootstrap Allocator.
 const BOOTSTRAP_HEAP_SIZE: usize = 2 * 1024 * 1024;
 

src/lib.rs

@@ -18,17 +18,14 @@ extern crate bitflags;
 #[macro_use]
 pub mod macros;
 
+pub mod allocator;
 pub mod arch;
 pub mod console;
 pub mod kernel;
-pub mod mm;
 mod runtime_glue;
 
 use core::ptr;
 
-#[global_allocator]
-static ALLOCATOR: mm::allocator::Allocator = mm::allocator::Allocator;
-
 // FUNCTIONS
 pub unsafe fn sections_init() {
 	extern "C" {

src/runtime_glue.rs

@@ -9,3 +9,10 @@ fn panic(info: &PanicInfo<'_>) -> ! {
 
 	loop {}
 }
+
+#[cfg(not(test))]
+#[alloc_error_handler]
+fn rust_oom(layout: core::alloc::Layout) -> ! {
+	let size = layout.size();
+	panic!("memory allocation of {size} bytes failed")
+}