Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-24 09:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give multiboot2 entry magic a name

Browse Source
This commit is contained in:
Zhang Junyang
2023-07-21 12:07:11 +08:00
committed by Tate, Hongliang Tian
parent 41d8e4228f
commit c932878dd1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/jinux-frame/src/arch/x86/boot/multiboot2/mod.rs
View File

@ -12,6 +12,8 @@ use crate::{config::PHYS_OFFSET, vm::paddr_to_vaddr};
global_asm!(include_str!("boot.S")); global_asm!(include_str!("boot.S"));
const MULTIBOOT2_ENTRY_MAGIC: u32 = 0x36d76289;
static MB2_INFO: Once<BootInformation> = Once::new(); static MB2_INFO: Once<BootInformation> = Once::new();
pub fn init_bootloader_name() { pub fn init_bootloader_name() {
@ -187,7 +189,7 @@ extern "Rust" {
#[no_mangle] #[no_mangle]
/// The entry point of Rust code called by inline asm. /// The entry point of Rust code called by inline asm.
unsafe extern "C" fn __multiboot2_entry(boot_magic: u32, boot_params: u64) -> ! { 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 { MB2_INFO.call_once(|| unsafe {
BootInformation::load(boot_params as *const BootInformationHeader).unwrap() BootInformation::load(boot_params as *const BootInformationHeader).unwrap()
}); });