From c932878dd1260cac768b62cffa29da7b9c74808f Mon Sep 17 00:00:00 2001 From: Zhang Junyang Date: Fri, 21 Jul 2023 12:07:11 +0800 Subject: [PATCH] Give multiboot2 entry magic a name --- framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs b/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs index 487b9a28d..7a6200d3f 100644 --- a/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs +++ b/framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs @@ -12,6 +12,8 @@ use crate::{config::PHYS_OFFSET, vm::paddr_to_vaddr}; global_asm!(include_str!("boot.S")); +const MULTIBOOT2_ENTRY_MAGIC: u32 = 0x36d76289; + static MB2_INFO: Once = Once::new(); pub fn init_bootloader_name() { @@ -187,7 +189,7 @@ extern "Rust" { #[no_mangle] /// The entry point of Rust code called by inline asm. unsafe extern "C" fn __multiboot2_entry(boot_magic: u32, boot_params: u64) -> ! { - assert_eq!(boot_magic, 0x36d76289_u32); + assert_eq!(boot_magic, MULTIBOOT2_ENTRY_MAGIC); MB2_INFO.call_once(|| unsafe { BootInformation::load(boot_params as *const BootInformationHeader).unwrap() });