mii/nel_os
1
0
Fork 0
mirror of https://github.com/mii443/nel_os.git synced 2025-08-22 16:15:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

update rust version

Browse Source
This commit is contained in:
Masato Imai
2025-05-01 08:08:24 +00:00
parent 33c5ef1ada
commit e164a0d252
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lib.rs
View File

@ -3,7 +3,6 @@
#![feature(custom_test_frameworks)] #![feature(custom_test_frameworks)]
#![feature(abi_x86_interrupt)] #![feature(abi_x86_interrupt)]
#![feature(alloc_error_handler)] #![feature(alloc_error_handler)]
#![feature(naked_functions)]
#![test_runner(crate::test_runner)] #![test_runner(crate::test_runner)]
#![reexport_test_harness_main = "test_main"] #![reexport_test_harness_main = "test_main"]

8
src/vmm/vcpu.rs
View File

@ -445,7 +445,7 @@ impl VCpu {
vmwrite(vmcs::host::RSP, rsp).unwrap(); vmwrite(vmcs::host::RSP, rsp).unwrap();
} }
#[naked] #[unsafe(naked)]
unsafe extern "C" fn asm_vm_entry_resume() -> u16 { unsafe extern "C" fn asm_vm_entry_resume() -> u16 {
const GUEST_REGS_OFFSET: usize = offset_of!(VCpu, guest_registers); const GUEST_REGS_OFFSET: usize = offset_of!(VCpu, guest_registers);
@ -524,7 +524,7 @@ impl VCpu {
); );
} }
#[naked] #[unsafe(naked)]
unsafe extern "C" fn asm_vm_entry() -> u16 { unsafe extern "C" fn asm_vm_entry() -> u16 {
const GUEST_REGS_OFFSET: usize = offset_of!(VCpu, guest_registers); const GUEST_REGS_OFFSET: usize = offset_of!(VCpu, guest_registers);
const LAUNCH_DONE: usize = offset_of!(VCpu, launch_done); const LAUNCH_DONE: usize = offset_of!(VCpu, launch_done);
@ -609,7 +609,7 @@ impl VCpu {
); );
} }
#[naked] #[unsafe(naked)]
unsafe extern "C" fn guest() -> ! { unsafe extern "C" fn guest() -> ! {
naked_asm!("2: hlt; jmp 2b"); naked_asm!("2: hlt; jmp 2b");
} }
@ -643,7 +643,7 @@ impl VCpu {
} }
} }
#[naked] #[unsafe(naked)]
unsafe extern "C" fn vmexit() -> ! { unsafe extern "C" fn vmexit() -> ! {
const RAX_OFFSET: usize = offset_of!(GuestRegisters, rax); const RAX_OFFSET: usize = offset_of!(GuestRegisters, rax);
const RCX_OFFSET: usize = offset_of!(GuestRegisters, rcx); const RCX_OFFSET: usize = offset_of!(GuestRegisters, rcx);