Convert some things to asm! syntax.

4 files changed, 14 insertions, 7 deletions

diff --git a/Cargo.toml b/Cargo.toml
index fb4ac39..4cf2e65 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "x86"
-version = "0.42.1"
+version = "0.43.0"
 authors = [
   "Gerd Zellweger <mail@gerdzellweger.com>",
   "Eric Kidd <git@randomhacks.net>",
diff --git a/src/lib.rs b/src/lib.rs
index 2c6aec5..a98bf1e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -90,7 +90,7 @@ pub enum Ring {
 /// Will cause a general protection fault if used outside of ring 0.
 #[inline(always)]
 pub unsafe fn halt() {
-    llvm_asm!("hlt" :::: "volatile");
+    asm!("hlt", options(att_syntax, nomem, nostack)); // check if preserves_flags
 }
 
 #[cfg(all(test, feature = "vmtest"))]
@@ -117,7 +117,7 @@ mod x86testing {
 #[inline(always)]
 pub unsafe fn rdpid() -> u64 {
     let mut pid: u64;
-    llvm_asm!("rdpid $0" : "=r"(pid));
+    asm!("rdpid {pid}", pid = out(reg) pid, options(att_syntax));
     pid
 }
 
diff --git a/src/task.rs b/src/task.rs
index a7b3423..d819e2d 100644
--- a/src/task.rs
+++ b/src/task.rs
@@ -4,9 +4,14 @@
 pub use crate::segmentation;
 
 /// Returns the current value of the task register.
-pub fn tr() -> segmentation::SegmentSelector {
+///
+/// # Safety
+/// Needs CPL 0.
+pub unsafe fn tr() -> segmentation::SegmentSelector {
     let segment: u16;
-    unsafe { llvm_asm!("str $0" : "=r" (segment) ) };
+    asm!("str {0:x}",
+        out(reg) segment,
+        options(att_syntax, nostack, nomem, preserves_flags));
     segmentation::SegmentSelector::from_raw(segment)
 }
 
@@ -15,5 +20,7 @@ pub fn tr() -> segmentation::SegmentSelector {
 /// # Safety
 /// Needs CPL 0.
 pub unsafe fn load_tr(sel: segmentation::SegmentSelector) {
-    llvm_asm!("ltr $0" :: "r" (sel.bits()));
+    asm!("ltr {0:x}",
+        in(reg) sel.bits(),
+        options(att_syntax, nostack, nomem, preserves_flags));
 }
diff --git a/src/tlb.rs b/src/tlb.rs
index e89a3ed..1c90120 100644
--- a/src/tlb.rs
+++ b/src/tlb.rs
@@ -6,7 +6,7 @@
 /// This function is unsafe as it causes a general protection fault (GP) if the current privilege
 /// level is not 0.
 pub unsafe fn flush(addr: usize) {
-    llvm_asm!("invlpg ($0)" :: "r" (addr) : "memory");
+    asm!("invlpg ({})", in(reg) addr, options(att_syntax, nostack, preserves_flags));
 }
 
 /// Invalidate the TLB completely by reloading the CR3 register.