Move memory initialisation from kmain to kernel::init

Previously, we initialised the heap (and the rest of memory)
in kmain, as memory::init used to return the PML4. Now that
it doesn't, there's no reason not to move memory::init into
kernel::init.

Signed-off-by: SlyMarbo <[email protected]>

Author: SlyMarbo

kernel/src/lib.rs

@@ -31,6 +31,7 @@ extern crate alloc;
 
 use alloc::vec;
 use alloc::vec::Vec;
+use bootloader::BootInfo;
 use core::panic::PanicInfo;
 use lazy_static::lazy_static;
 use raw_cpuid::CpuId;
@@ -50,11 +51,14 @@ lazy_static! {
 
 /// init sets up critical core functions of the kernel.
 ///
-pub fn init() {
+pub fn init(boot_info: &'static BootInfo) {
     gdt::init();
     interrupts::init();
     time::init();
     x86_64::instructions::interrupts::enable();
+
+    // Set up the heap allocator.
+    unsafe { memory::init(boot_info) };
 }
 
 #[alloc_error_handler]
@@ -287,16 +291,16 @@ pub fn shutdown_qemu() {
 }
 
 #[cfg(test)]
-use bootloader::{entry_point, BootInfo};
+use bootloader::entry_point;
 
 #[cfg(test)]
 entry_point!(test_kernel_main);
 
 /// test_kernel_main is the entry point for `cargo xtest`.
 ///
 #[cfg(test)]
-fn test_kernel_main(_boot_info: &'static BootInfo) -> ! {
-    init();
+fn test_kernel_main(boot_info: &'static BootInfo) -> ! {
+    init(boot_info);
     test_main();
     halt_loop();
 }

kernel/src/main.rs

@@ -35,23 +35,20 @@ entry_point!(kernel_main);
 #[allow(unused_variables)]
 fn kernel_main(boot_info: &'static BootInfo) -> ! {
     println!("Kernel booting...");
-    kernel::init();
+    kernel::init(boot_info);
 
     #[cfg(test)]
     test_main();
 
     #[cfg(not(test))]
-    kmain(boot_info);
+    kmain();
 
     kernel::shutdown_qemu();
     kernel::halt_loop();
 }
 
 #[cfg(not(test))]
-fn kmain(boot_info: &'static BootInfo) {
-    // Set up the heap allocator.
-    unsafe { memory::init(boot_info) };
-
+fn kmain() {
     println!("Kernel ready!");
     println!("Kernel booted at {}.", time::boot_time());
     if let Some(branding) = CPU_ID.get_processor_brand_string() {

kernel/tests/heap_allocation.rs

@@ -11,16 +11,15 @@ use bootloader::bootinfo::{FrameRange, MemoryRegion, MemoryRegionType};
 use bootloader::{entry_point, BootInfo};
 use core::panic::PanicInfo;
 use kernel::memory::pmm::BitmapFrameAllocator;
-use kernel::memory::{self, KERNEL_HEAP};
+use kernel::memory::KERNEL_HEAP;
 use kernel::Bitmap;
 use x86_64::structures::paging::{FrameAllocator, FrameDeallocator, PhysFrame};
 use x86_64::PhysAddr;
 
 entry_point!(main);
 
 fn main(boot_info: &'static BootInfo) -> ! {
-    kernel::init();
-    unsafe { memory::init(boot_info) };
+    kernel::init(boot_info);
 
     test_main();
     loop {}