mirror of
https://github.com/phil-opp/blog_os.git
synced 2025-12-16 22:37:49 +00:00
Fix boot loop by enabling the NXE bit in the EFER register
This commit is contained in:
11
src/lib.rs
11
src/lib.rs
@@ -45,12 +45,23 @@ pub extern fn rust_main(multiboot_information_address: usize) {
|
|||||||
kernel_start as usize, kernel_end as usize, multiboot_start,
|
kernel_start as usize, kernel_end as usize, multiboot_start,
|
||||||
multiboot_end, memory_map_tag.memory_areas());
|
multiboot_end, memory_map_tag.memory_areas());
|
||||||
|
|
||||||
|
enable_nxe_bit();
|
||||||
memory::remap_the_kernel(&mut frame_allocator, boot_info);
|
memory::remap_the_kernel(&mut frame_allocator, boot_info);
|
||||||
println!("It did not crash!");
|
println!("It did not crash!");
|
||||||
|
|
||||||
loop {}
|
loop {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn enable_nxe_bit() {
|
||||||
|
use x86_64::registers::msr::{IA32_EFER, rdmsr, wrmsr};
|
||||||
|
|
||||||
|
let nxe_bit = 1 << 11;
|
||||||
|
unsafe {
|
||||||
|
let efer = rdmsr(IA32_EFER);
|
||||||
|
wrmsr(IA32_EFER, efer | nxe_bit);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[lang = "eh_personality"] extern fn eh_personality() {}
|
#[lang = "eh_personality"] extern fn eh_personality() {}
|
||||||
|
|
||||||
#[lang = "panic_fmt"]
|
#[lang = "panic_fmt"]
|
||||||
|
|||||||
Reference in New Issue
Block a user