convert inline assmebly to the new assembly format

stlankes · stlankes · commit 2fc2c1e6f452 · 2021-11-07T13:48:34.000+01:00
diff --git a/src/arch/x86_64/kernel/mod.rs b/src/arch/x86_64/kernel/mod.rs
@@ -5,7 +5,7 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-mod gdt;
+pub mod gdt;
 pub mod irq;
 mod pit;
 pub mod processor;
@@ -18,7 +18,7 @@ pub mod task;
 pub use crate::arch::x86_64::kernel::syscall::syscall_handler;
 use core::ptr::read_volatile;
 
-global_asm!(include_str!("user_land.s"));
+global_asm!(include_str!("user_land.s"), options(att_syntax));
 
 #[repr(C)]
 struct KernelHeader {
@@ -45,7 +45,7 @@ pub fn register_task() {
 	let sel: u16 = 6u16 << 3;
 
 	unsafe {
-		llvm_asm!("ltr $0" :: "r"(sel) :: "volatile");
+		asm!("ltr ax", in("ax") sel, options(nostack, nomem));
 	}
 }
 
@@ -124,7 +124,12 @@ macro_rules! syscall {
 pub fn syscall0(arg0: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall" : "={rax}" (ret) : "{rax}" (arg0) : "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -134,8 +139,13 @@ pub fn syscall0(arg0: u64) -> u64 {
 pub fn syscall1(arg0: u64, arg1: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall"	: "={rax}" (ret) : "{rax}" (arg0), "{rdi}" (arg1)
-						: "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -145,8 +155,14 @@ pub fn syscall1(arg0: u64, arg1: u64) -> u64 {
 pub fn syscall2(arg0: u64, arg1: u64, arg2: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall"	: "={rax}" (ret) : "{rax}" (arg0), "{rdi}" (arg1), "{rsi}" (arg2)
-						: "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -156,8 +172,15 @@ pub fn syscall2(arg0: u64, arg1: u64, arg2: u64) -> u64 {
 pub fn syscall3(arg0: u64, arg1: u64, arg2: u64, arg3: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall"	: "={rax}" (ret) : "{rax}" (arg0), "{rdi}" (arg1), "{rsi}" (arg2),
-						"{rdx}" (arg3) : "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			in("rdx") arg3,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -167,9 +190,16 @@ pub fn syscall3(arg0: u64, arg1: u64, arg2: u64, arg3: u64) -> u64 {
 pub fn syscall4(arg0: u64, arg1: u64, arg2: u64, arg3: u64, arg4: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall"	: "={rax}" (ret)
-						: "{rax}"  (arg0), "{rdi}"  (arg1), "{rsi}"  (arg2), "{rdx}"  (arg3),
-						"{r10}"  (arg4) : "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			in("rdx") arg3,
+			in("r10") arg4,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -179,9 +209,17 @@ pub fn syscall4(arg0: u64, arg1: u64, arg2: u64, arg3: u64, arg4: u64) -> u64 {
 pub fn syscall5(arg0: u64, arg1: u64, arg2: u64, arg3: u64, arg4: u64, arg5: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall"	: "={rax}" (ret)
-						: "{rax}" (arg0), "{rdi}" (arg1), "{rsi}" (arg2), "{rdx}" (arg3),
-						"{r10}" (arg4), "{r8}" (arg5) : "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			in("rdx") arg3,
+			in("r10") arg4,
+			in("r8") arg5,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -199,9 +237,18 @@ pub fn syscall6(
 ) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		llvm_asm!("syscall"	: "={rax}" (ret) : "{rax}" (arg0), "{rdi}" (arg1), "{rsi}" (arg2),
-						"{rdx}" (arg3), "{r10}" (arg4), "{r8}" (arg5), "{r9}" (arg6)
-						: "rcx", "r11", "memory" : "volatile");
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			in("rdx") arg3,
+			in("r10") arg4,
+			in("r8") arg5,
+			in("r9") arg6,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
diff --git a/src/arch/x86_64/kernel/processor.rs b/src/arch/x86_64/kernel/processor.rs
@@ -26,7 +26,7 @@ static mut SUPPORTS_1GIB_PAGES: bool = false;
 #[inline(always)]
 pub fn mb() {
 	unsafe {
-		llvm_asm!("mfence" ::: "memory" : "volatile");
+		asm!("mfence", options(preserves_flags, nostack));
 	}
 }
 
@@ -37,9 +37,9 @@ pub fn msb(value: u64) -> Option<u64> {
 		let ret: u64;
 		unsafe {
 			asm!("bsr {0}, {1}",
-			    out(reg) ret,
+				out(reg) ret,
 				in(reg) value,
-			    options(nomem, nostack)
+				options(nomem, nostack)
 			);
 		}
 		Some(ret)
@@ -55,9 +55,9 @@ pub fn lsb(value: u64) -> Option<u64> {
 		let ret: u64;
 		unsafe {
 			asm!("bsf {0}, {1}",
-			    out(reg) ret,
+				out(reg) ret,
 				in(reg) value,
-			    options(nomem, nostack)
+				options(nomem, nostack)
 			);
 		}
 		Some(ret)
@@ -179,7 +179,7 @@ pub fn init() {
 
 		// reset GS registers
 		wrmsr(IA32_GS_BASE, 0);
-		llvm_asm!("wrgsbase $0" :: "r"(BOOT_STACK.top()) :: "volatile");
+		asm!("wrgsbase {}", in(reg) BOOT_STACK.top(), options(preserves_flags, nomem, nostack));
 	}
 
 	// determin processor features
diff --git a/src/arch/x86_64/kernel/switch.rs b/src/arch/x86_64/kernel/switch.rs
@@ -5,7 +5,7 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-use crate::arch::x86_64::gdt::set_current_kernel_stack;
+use crate::arch::x86_64::kernel::gdt::set_current_kernel_stack;
 
 macro_rules! save_context {
 	() => {
diff --git a/src/arch/x86_64/kernel/syscall.rs b/src/arch/x86_64/kernel/syscall.rs
@@ -5,54 +5,58 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
+use crate::syscall::SYSHANDLER_TABLE;
+
 #[no_mangle]
 #[naked]
 pub unsafe extern "C" fn syscall_handler() {
-	llvm_asm!(
+	asm!(
 		// save context, see x86_64 ABI
-		"push %rcx\n\t\
-		push %rdx\n\t\
-		push %rsi\n\t\
-		push %rdi\n\t\
-		push %r8\n\t\
-		push %r9\n\t\
-		push %r10\n\t\
-		push %r11\n\t\
-		// save ds/es and set to kernel data descriptor \n\t\
-		mov %ds, %rcx\n\t\
-		push %rcx\n\t\
-		mov %es, %rcx\n\t\
-		push %rcx\n\t\
-		mov $$0x10, %rcx\n\t\
-		mov %rcx, %ds\n\t\
-		mov %rcx, %es\n\t\
-		// switch to kernel stack\n\t
-		swapgs\n\t
-		mov %rsp, %rcx\n\t
-		rdgsbase %rsp\n\t
-		push %rcx
-		// copy 4th argument to rcx to adhere x86_64 ABI \n\t\
-		mov %r10, %rcx\n\t\
-		sti\n\t\
-		call *SYSHANDLER_TABLE(,%rax,8)\n\t
-		// restore context, see x86_64 ABI \n\t\
-		cli\n\t\
-		// switch to user stack\n\t
-		pop %rcx\n\t
-		mov %rcx, %rsp\n\t
-		swapgs\n\t\
-		// restore context
-		pop %rcx\n\t\
-		mov %rcx, %es\n\t\
-	    pop %rcx\n\t\
-		mov %rcx, %ds\n\t\
-		pop %r11\n\t\
-		pop %r10\n\t\
-		pop %r9\n\t\
-		pop %r8\n\t\
-		pop %rdi\n\t\
-		pop %rsi\n\t\
-		pop %rdx\n\t\
-		pop %rcx\n\t\
-		sysretq" :::: "volatile");
+		"push rcx",
+		"push rdx",
+		"push rsi",
+		"push rdi",
+		"push r8",
+		"push r9",
+		"push r10",
+		"push r11",
+		// save ds/es and set to kernel data descriptor
+		"mov rcx, ds",
+		"push rcx",
+		"mov rcx, es",
+		"push rcx",
+		"mov rcx, {kernel_ds}",
+		"mov ds, rcx",
+		"mov es, rcx",
+		// switch to kernel stack
+		"swapgs",
+		"mov rcx, rsp",
+		"rdgsbase rsp",
+		"push rcx",
+		// copy 4th argument to rcx to adhere x86_64 ABI
+		"mov rcx, r10",
+		"sti",
+		"call [{sys_handler}+8*rax]",
+		// restore context, see x86_64 ABI
+		"cli",
+		// switch to user stack
+		"pop rcx",
+		"mov rsp, rcx",
+		"swapgs",
+		"pop rcx",
+		"mov es, rcx",
+	    "pop rcx",
+		"mov ds, rcx",
+		"pop r11",
+		"pop r10",
+		"pop r9",
+		"pop r8",
+		"pop rdi",
+		"pop rsi",
+		"pop rdx",
+		"pop rcx",
+		"sysretq",
+		sys_handler = sym SYSHANDLER_TABLE,
+		kernel_ds = const 0x10,
+		options(noreturn));
 }
diff --git a/src/arch/x86_64/mm/paging.rs b/src/arch/x86_64/mm/paging.rs
@@ -238,7 +238,7 @@ impl<S: PageSize> Page<S> {
 	#[inline(always)]
 	fn flush_from_tlb(&self) {
 		unsafe {
-			llvm_asm!("invlpg ($0)" :: "r"(self.virtual_address) : "memory" : "volatile");
+			asm!("invlpg [{}]", in(reg) self.virtual_address, options(preserves_flags, nostack));
 		}
 	}
 
diff --git a/src/arch/x86_64/mod.rs b/src/arch/x86_64/mod.rs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2018 Stefan Lankes, RWTH Aachen University
+// Copyright (c) 2017-2021 Stefan Lankes, RWTH Aachen University
 //
 // Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
 // http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ impl<S: PageSize> Page<S> {`
`238`	`238`	`#[inline(always)]`
`239`	`239`	`fn flush_from_tlb(&self) {`
`240`	`240`	`unsafe {`
`241`		`- llvm_asm!("invlpg ($0)" :: "r"(self.virtual_address) : "memory" : "volatile");`
	`241`	`+ asm!("invlpg [{}]", in(reg) self.virtual_address, options(preserves_flags, nostack));`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2017-2018 Stefan Lankes, RWTH Aachen University`
	`1`	`+// Copyright (c) 2017-2021 Stefan Lankes, RWTH Aachen University`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or`
`4`	`4`	`// http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or`