fix(arch): migrate to naked_asm in naked functions

Signed-off-by: Martin Kröning <[email protected]>

src/arch/aarch64/kernel/scheduler.rs

@@ -2,7 +2,7 @@
 
 use alloc::alloc::{alloc_zeroed, Layout};
 use alloc::boxed::Box;
-use core::arch::asm;
+use core::arch::naked_asm;
 use core::sync::atomic::Ordering;
 use core::{mem, ptr, slice};
 
@@ -329,7 +329,7 @@ extern "C" fn task_start(_f: extern "C" fn(usize), _arg: usize) -> ! {
 	// `arg` is in the `x1` register
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			"msr spsel, {l0}",
 			"mov x25, x0",
 			"mov x0, x1",
@@ -340,7 +340,6 @@ extern "C" fn task_start(_f: extern "C" fn(usize), _arg: usize) -> ! {
 			"br x4",
 			l0 = const 0,
 			exit = sym thread_exit,
-			options(noreturn)
 		)
 	}
 }

src/arch/aarch64/kernel/start.rs

@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::{asm, naked_asm};
 
 use hermit_entry::boot_info::RawBootInfo;
 use hermit_entry::Entry;
@@ -28,7 +28,7 @@ pub unsafe extern "C" fn _start(boot_info: Option<&'static RawBootInfo>, cpu_id:
 	}
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			"msr spsel, {l1}", // we want to use sp_el1
 			"adrp x8, {current_stack_address}",
 			"mov x4, sp",
@@ -45,7 +45,6 @@ pub unsafe extern "C" fn _start(boot_info: Option<&'static RawBootInfo>, cpu_id:
 			stack_top_offset = const KERNEL_STACK_SIZE - TaskStacks::MARKER_SIZE,
 			current_stack_address = sym super::CURRENT_STACK_ADDRESS,
 			pre_init = sym pre_init,
-			options(noreturn),
 		)
 	}
 }

src/arch/riscv64/kernel/start.rs

@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::naked_asm;
 use core::sync::atomic::Ordering;
 
 use fdt::Fdt;
@@ -31,7 +31,7 @@ pub unsafe extern "C" fn _start(hart_id: usize, boot_info: Option<&'static RawBo
 	}
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			// Use stack pointer from `CURRENT_STACK_ADDRESS` if set
 			"ld      t0, {current_stack_pointer}",
 			"beqz    t0, 2f",
@@ -44,7 +44,6 @@ pub unsafe extern "C" fn _start(hart_id: usize, boot_info: Option<&'static RawBo
 			current_stack_pointer = sym CURRENT_STACK_ADDRESS,
 			top_offset = const KERNEL_STACK_SIZE,
 			pre_init = sym pre_init,
-			options(noreturn),
 		)
 	}
 }

src/arch/x86_64/kernel/scheduler.rs

@@ -2,7 +2,7 @@
 
 #[cfg(not(feature = "common-os"))]
 use alloc::boxed::Box;
-use core::arch::asm;
+use core::arch::naked_asm;
 #[cfg(not(feature = "common-os"))]
 use core::mem::MaybeUninit;
 #[cfg(not(feature = "common-os"))]
@@ -316,12 +316,11 @@ extern "C" fn task_start(_f: extern "C" fn(usize), _arg: usize, _user_stack: u64
 	// `user_stack` is in the `rdx` register
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			"mov rsp, rdx",
 			"sti",
 			"jmp {task_entry}",
 			task_entry = sym task_entry,
-			options(noreturn)
 		)
 	}
 }

src/arch/x86_64/kernel/start.rs

@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::naked_asm;
 
 use hermit_entry::boot_info::RawBootInfo;
 use hermit_entry::Entry;
@@ -26,7 +26,7 @@ pub unsafe extern "C" fn _start(_boot_info: Option<&'static RawBootInfo>, cpu_id
 	}
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			// use core::sync::atomic::{AtomicU32, Ordering};
 			//
 			// pub static CPU_ONLINE: AtomicU32 = AtomicU32::new(0);
@@ -61,7 +61,6 @@ pub unsafe extern "C" fn _start(_boot_info: Option<&'static RawBootInfo>, cpu_id
 			current_stack_address = sym super::CURRENT_STACK_ADDRESS,
 			stack_top_offset = const KERNEL_STACK_SIZE - TaskStacks::MARKER_SIZE,
 			pre_init = sym pre_init,
-			options(noreturn)
 		)
 	}
 }

src/arch/x86_64/kernel/switch.rs

@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::{asm, naked_asm};
 use core::{mem, ptr};
 
 use crate::core_local::CoreLocal;
@@ -173,7 +173,7 @@ pub(crate) unsafe extern "C" fn switch_to_task(_old_stack: *mut usize, _new_stac
 	// `new_stack` is in `rsi` register
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			save_context!(),
 			// Store the old `rsp` behind `old_stack`
 			"mov [rdi], rsp",
@@ -187,7 +187,6 @@ pub(crate) unsafe extern "C" fn switch_to_task(_old_stack: *mut usize, _new_stac
 			"call {set_current_kernel_stack}",
 			restore_context!(),
 			set_current_kernel_stack = sym set_current_kernel_stack,
-			options(noreturn)
 		);
 	}
 }
@@ -200,7 +199,7 @@ pub(crate) unsafe extern "C" fn switch_to_fpu_owner(_old_stack: *mut usize, _new
 	// `new_stack` is in `rsi` register
 
 	unsafe {
-		asm!(
+		naked_asm!(
 			save_context!(),
 			// Store the old `rsp` behind `old_stack`
 			"mov [rdi], rsp",
@@ -211,7 +210,6 @@ pub(crate) unsafe extern "C" fn switch_to_fpu_owner(_old_stack: *mut usize, _new
 			"call {set_current_kernel_stack}",
 			restore_context!(),
 			set_current_kernel_stack = sym set_current_kernel_stack,
-			options(noreturn),
 		);
 	}
 }

src/arch/x86_64/kernel/syscall.rs

@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::naked_asm;
 use core::mem;
 
 use super::core_local::CoreLocal;
@@ -8,7 +8,7 @@ use crate::syscalls::table::SYSHANDLER_TABLE;
 #[naked]
 pub(crate) unsafe extern "C" fn syscall_handler() -> ! {
 	unsafe {
-		asm!(
+		naked_asm!(
 			// save context, see x86_64 ABI
 			"push rcx",
 			"push rdx",
@@ -46,7 +46,6 @@ pub(crate) unsafe extern "C" fn syscall_handler() -> ! {
 			"sysretq",
 			core_local_kernel_stack = const mem::offset_of!(CoreLocal, kernel_stack),
 			table = sym SYSHANDLER_TABLE,
-			options(noreturn)
 		);
 	}
 }

src/syscalls/table.rs

@@ -1,4 +1,4 @@
-use core::arch::asm;
+use core::arch::naked_asm;
 
 use crate::syscalls::*;
 
@@ -42,11 +42,10 @@ extern "C" fn invalid_syscall(sys_no: u64) -> ! {
 #[naked]
 pub(crate) unsafe extern "C" fn sys_invalid() {
 	unsafe {
-		asm!(
+		naked_asm!(
 			"mov rdi, rax",
 			"call {}",
 			sym invalid_syscall,
-			options(noreturn)
 		);
 	}
 }