convert inline assmebly to the new assembly format

Author: stlankes

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;
@@ -17,8 +17,8 @@ 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!("switch.s"));
+global_asm!(include_str!("user_land.s"), options(att_syntax));
+global_asm!(include_str!("switch.s"), options(att_syntax));
 
 #[repr(C)]
 struct KernelHeader {
@@ -61,7 +61,7 @@ pub fn register_task() {
 	let sel: u16 = 6u16 << 3;
 
 	unsafe {
-		asm!("ltr ax", in("ax") sel, options(nostack));
+		asm!("ltr ax", in("ax") sel, options(nostack, nomem));
 	}
 }
 
@@ -140,7 +140,12 @@ macro_rules! syscall {
 pub fn syscall0(arg0: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		asm!("syscall", lateout("rax") ret, in("rax") arg0, lateout("rcx") _, lateout("r11") _);
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -150,7 +155,13 @@ pub fn syscall0(arg0: u64) -> u64 {
 pub fn syscall1(arg0: u64, arg1: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		asm!("syscall", lateout("rax") ret, in("rax") arg0, in("rdi") arg1, lateout("rcx") _, lateout("r11") _);
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -160,7 +171,14 @@ pub fn syscall1(arg0: u64, arg1: u64) -> u64 {
 pub fn syscall2(arg0: u64, arg1: u64, arg2: u64) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		asm!("syscall",  lateout("rax") ret, in("rax") arg0, in("rdi") arg1, in("rsi") arg2, lateout("rcx") _, lateout("r11") _);
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -170,7 +188,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 {
-		asm!("syscall",  lateout("rax") ret, in("rax") arg0, in("rdi") arg1, in("rsi") arg2, in("rdx") arg3, lateout("rcx") _, lateout("r11") _);
+		asm!("syscall",
+			inlateout("rax") arg0 => ret,
+			in("rdi") arg1,
+			in("rsi") arg2,
+			in("rdx") arg3,
+			lateout("rcx") _,
+			lateout("r11") _,
+			options(preserves_flags, nostack)
+		);
 	}
 	ret
 }
@@ -180,7 +206,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 {
-		asm!("syscall",  lateout("rax") ret, in("rax") arg0, in("rdi") arg1, in("rsi") arg2, in("rdx") arg3, in("r10") arg4, lateout("rcx") _, lateout("r11") _);
+		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
 }
@@ -190,7 +225,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 {
-		asm!("syscall",  lateout("rax") ret, in("rax") arg0, in("rdi") arg1, in("rsi") arg2, in("rdx") arg3, in("r10") arg4, in("r8") arg5, lateout("rcx") _, lateout("r11") _);
+		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
 }
@@ -208,7 +253,18 @@ pub fn syscall6(
 ) -> u64 {
 	let mut ret: u64;
 	unsafe {
-		asm!("syscall",  lateout("rax") ret, in("rax") arg0, in("rdi") arg1, in("rsi") arg2, in("rdx") arg3, in("r10") arg4, in("r8") arg5, in("r9") arg6, lateout("rcx") _, lateout("r11") _);
+		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
 }

src/arch/x86_64/kernel/processor.rs

@@ -26,7 +26,7 @@ static mut SUPPORTS_1GIB_PAGES: bool = false;
 #[inline(always)]
 pub fn mb() {
 	unsafe {
-		asm!("mfence", options(nostack));
+		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);
-		asm!("wrgsbase {}", in(reg) BOOT_STACK.top());
+		asm!("wrgsbase {}", in(reg) BOOT_STACK.top(), options(preserves_flags, nomem, nostack));
 	}
 
 	// determin processor features

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 {
 	() => {

src/arch/x86_64/mm/paging.rs

@@ -238,7 +238,11 @@ impl<S: PageSize> Page<S> {
 	#[inline(always)]
 	fn flush_from_tlb(&self) {
 		unsafe {
+<<<<<<< HEAD
 			asm!("invlpg [{0}]", in(reg) self.virtual_address, options(nostack));
+=======
+			asm!("invlpg [{}]", in(reg) self.virtual_address, options(preserves_flags, nostack));
+>>>>>>> 7d66029... convert inline assmebly to the new assembly format
 		}
 	}
 

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