fix: naked_asm!

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/arch/x86_64/mem.rs

@@ -15,6 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Aero. If not, see <https://www.gnu.org/licenses/>.
 
+use core::arch::naked_asm;
+
 fn should_store_by_byte() -> bool {
     let cpuid = raw_cpuid::CpuId::new();
     if let Some(features) = cpuid.get_extended_feature_info() {
@@ -32,7 +34,7 @@ unsafe extern "C" fn memcpy_movsq(dest: *mut u8, src: *const u8, len: usize) ->
     // %rdi = argument 1, `dest`
     // %rsi = argument 2, `src`
     // %rdx = argument 3, `len`
-    asm!(
+    naked_asm!(
         // Save the return value.
         "mov rax, rdi",
         // Copy in 8 byte chunks.
@@ -44,7 +46,6 @@ unsafe extern "C" fn memcpy_movsq(dest: *mut u8, src: *const u8, len: usize) ->
         "and rcx, 0x7",
         "rep movsb",
         "ret",
-        options(noreturn)
     );
 }
 
@@ -55,14 +56,13 @@ unsafe extern "C" fn memcpy_movsb(dest: *mut u8, src: *const u8, len: usize) ->
     // %rdi = argument 1, `dest`
     // %rsi = argument 2, `src`
     // %rdx = argument 3, `len`
-    asm!(
+    naked_asm!(
         // Save the return value.
         "mov rax, rdi",
         // Copy!
         "mov rcx, rdx",
         "rep movsb",
         "ret",
-        options(noreturn)
     )
 }
 
@@ -82,7 +82,7 @@ unsafe extern "C" fn memset_stosq(dest: *mut u8, byte: i32, len: usize) -> *mut
     // %rdi = argument 1, `dest`
     // %rsi = argument 2, `byte`
     // %rdx = argument 3, `len`
-    asm!(
+    naked_asm!(
         // Save the return value.
         "mov r11, rdi",
         // Create an 8-byte copy of the pattern.
@@ -101,7 +101,6 @@ unsafe extern "C" fn memset_stosq(dest: *mut u8, byte: i32, len: usize) -> *mut
         // Restore the return value.
         "mov rax, r11",
         "ret",
-        options(noreturn)
     )
 }
 
@@ -112,15 +111,14 @@ unsafe extern "C" fn memset_stosb(dest: *mut u8, byte: i32, len: usize) -> *mut
     // %rdi = argument 1, `dest`
     // %rsi = argument 2, `byte`
     // %rdx = argument 3, `len`
-    asm!(
+    naked_asm!(
         // Save the return value.
         "mov r11, rdi",
         "mov al, sil",
         "mov rcx, rdx",
         "rep stosb",
         "mov rax, r11",
         "ret",
-        options(noreturn)
     )
 }
 
@@ -141,7 +139,7 @@ unsafe extern "C" fn memmove_erms(dest: *mut u8, src: *const u8, len: usize) ->
     // %rdi = argument 1, `dest`
     // %rsi = argument 2, `src`
     // %rdx = argument 3, `len`
-    asm!(
+    naked_asm!(
         "mov rax, rdi",
         // Skip zero length.
         "test rdx, rdx",
@@ -167,7 +165,6 @@ unsafe extern "C" fn memmove_erms(dest: *mut u8, src: *const u8, len: usize) ->
         "rep movsb",
         "cld",
         "ret",
-        options(noreturn)
     )
 }
 

src/aero_kernel/src/arch/x86_64/syscall.rs

@@ -9,6 +9,7 @@ use crate::utils::sync::IrqGuard;
 use super::interrupts::InterruptErrorStack;
 use super::{asm_macros, io};
 
+use core::arch::naked_asm;
 use core::mem::offset_of;
 
 const ARCH_SET_GS: usize = 0x1001;
@@ -39,7 +40,7 @@ const ARCH_GET_GS: usize = 0x1004;
 /// The instruction also does not save anything on the stack and does *not* change the `RSP`.
 #[naked]
 unsafe extern "C" fn x86_64_syscall_handler() {
-    asm!(
+    naked_asm!(
         // make the GS base point to the kernel TLS
         "swapgs",
         // save the user stack pointer
@@ -89,7 +90,6 @@ unsafe extern "C" fn x86_64_syscall_handler() {
         tss_temp_ustack_off = const offset_of!(Tss, reserved2) + core::mem::size_of::<usize>(),
         tss_rsp0_off = const offset_of!(Tss, rsp) + core::mem::size_of::<usize>(),
         x86_64_do_syscall = sym x86_64_do_syscall,
-        options(noreturn)
     )
 }
 
@@ -107,7 +107,7 @@ unsafe extern "C" fn x86_64_syscall_handler() {
 /// The instruction expects the call number and arguments in the same registers as for SYSCALL.
 #[naked]
 unsafe extern "C" fn x86_64_sysenter_handler() {
-    asm!(
+    naked_asm!(
         "swapgs",
         // Build the interrupt frame expected by the kernel.
         "push {userland_ss}",
@@ -155,7 +155,6 @@ unsafe extern "C" fn x86_64_sysenter_handler() {
         userland_ss = const USER_SS.bits(),
         x86_64_check_sysenter = sym x86_64_check_sysenter,
         x86_64_do_syscall = sym x86_64_do_syscall,
-        options(noreturn)
     )
 }
 

src/aero_kernel/src/arch/x86_64/task.rs

@@ -37,6 +37,7 @@ use alloc::vec::Vec;
 use raw_cpuid::CpuId;
 
 use core::alloc::Layout;
+use core::arch::naked_asm;
 use core::ptr::Unique;
 
 use crate::arch::interrupts::InterruptErrorStack;
@@ -115,7 +116,8 @@ const USERLAND_STACK_BOTTOM: VirtAddr = USERLAND_STACK_TOP.const_sub_u64(USERLAN
 
 #[naked]
 unsafe extern "C" fn jump_userland_exec(stack: VirtAddr, rip: VirtAddr, rflags: u64) {
-    asm!(
+    #[rustfmt::skip]
+    naked_asm!(
         "push rdi", // stack
         "push rsi", // rip
         "push rdx", // rflags
@@ -124,14 +126,13 @@ unsafe extern "C" fn jump_userland_exec(stack: VirtAddr, rip: VirtAddr, rflags:
         "pop rcx",
         "pop rsp",
         "swapgs",
-        "sysretq",
-        options(noreturn)
+        "sysretq"
     );
 }
 
 #[naked]
 unsafe extern "C" fn task_spinup(prev: &mut Unique<Context>, next: &Context) {
-    asm!(
+    naked_asm!(
         // save callee-saved registers
         "push rbp",
         "push rbx",
@@ -158,34 +159,31 @@ unsafe extern "C" fn task_spinup(prev: &mut Unique<Context>, next: &Context) {
         "pop rbp",
         // resume the next thread
         "ret",
-        options(noreturn)
     );
 }
 
 #[naked]
 unsafe extern "C" fn iretq_init() {
-    asm!(
+    naked_asm!(
         "cli",
         // pop the error code
         "add rsp, 8",
         asm_macros::pop_preserved!(),
         asm_macros::pop_scratch!(),
         "iretq",
-        options(noreturn)
     )
 }
 
 #[naked]
 unsafe extern "C" fn fork_init() {
-    asm!(
+    naked_asm!(
         "cli",
         // pop the error code
         "add rsp, 8",
         asm_macros::pop_preserved!(),
         asm_macros::pop_scratch!(),
         "swapgs",
         "iretq",
-        options(noreturn)
     )
 }
 

src/aero_kernel/src/arch/x86_64/user_copy.rs

@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Aero. If not, see <https://www.gnu.org/licenses/>.
 
+use core::arch::naked_asm;
 use core::fmt::{Debug, Display};
 use core::mem::MaybeUninit;
 use core::ops::{Deref, DerefMut};
@@ -52,7 +53,7 @@ unsafe extern "C" fn copy_to_from_user(
     // %rsi = argument 2, `src`
     // %rdx = argument 3, `size`
     // %rcx = argument 4, `fault_resume` (copied to %r10)
-    asm!(
+    naked_asm!(
         // Copy `fault_resume` out of %rcx because it will be utilized by `rep movsb` latter.
         "mov r10, rcx",
         // Setup the page fault resume.
@@ -82,7 +83,6 @@ unsafe extern "C" fn copy_to_from_user(
         "1:",
         "xor eax, eax",
         "jmp 3b",
-        options(noreturn)
     )
 }