Use asm macro instead of removed llvm_asm.

Author: cr1901

src/asm.rs

@@ -1,21 +1,19 @@
 //! Miscellaneous assembly instructions
 
+use crate::asm;
+
 /// A no-operation. Useful to prevent delay loops from being optimized away.
 #[inline(always)]
 pub fn nop() {
     unsafe {
-        llvm_asm!("nop"
-             :
-             :
-             :
-             : "volatile");
+        asm!("nop");
     }
 }
 
 /// A compiler fence, prevents instruction reordering.
 #[inline(always)]
 pub fn barrier() {
     unsafe {
-        llvm_asm!("" ::: "memory" : "volatile");
+        asm!("");
     }
 }

src/interrupt.rs

@@ -1,5 +1,7 @@
 //! Interrupts
 
+use crate::asm;
+
 pub use bare_metal::{CriticalSection, Mutex};
 
 /// Disables all interrupts
@@ -8,11 +10,7 @@ pub fn disable() {
     match () {
         #[cfg(target_arch = "msp430")]
         () => unsafe {
-            llvm_asm!("dint { nop"
-                 :
-                 :
-                 : "memory"
-                 : "volatile");
+            asm!("dint {{ nop");
         },
         #[cfg(not(target_arch = "msp430"))]
         () => {}
@@ -31,11 +29,7 @@ pub unsafe fn enable() {
     match () {
         #[cfg(target_arch = "msp430")]
         () => {
-            llvm_asm!("nop { eint { nop"
-                 :
-                 :
-                 : "memory"
-                 : "volatile");
+            asm!("nop {{ eint {{ nop");
         }
         #[cfg(not(target_arch = "msp430"))]
         () => {}

src/lib.rs

@@ -10,9 +10,11 @@
 //! - Safe wrappers around assembly instructions like `nop`
 
 #![deny(missing_docs)]
-#![feature(llvm_asm)]
+#![feature(asm_experimental_arch)]
 #![no_std]
 
+use core::arch::asm;
+
 extern crate bare_metal;
 
 #[macro_use]

src/register/pc.rs

@@ -1,25 +1,19 @@
 //! Program counter
 
+use crate::asm;
+
 /// Reads the CPU register
 #[inline(always)]
 pub fn read() -> u16 {
     let r;
     unsafe {
-        llvm_asm!("mov R0,$0"
-             : "=r"(r)
-             :
-             :
-             : "volatile");
+        asm!("mov R0, {0}", out(reg) r);
     }
     r
 }
 
 /// Writes `bits` to the CPU register
 #[inline(always)]
 pub unsafe fn write(bits: u16) {
-    llvm_asm!("mov $0,R0"
-         :
-         : "r"(bits)
-         :
-         : "volatile");
+    asm!("mov {0}, R0", in(reg) bits);
 }

src/register/sp.rs

@@ -1,25 +1,19 @@
 //! Main Stack Pointer
 
+use crate::asm;
+
 /// Reads the CPU register
 #[inline(always)]
 pub fn read() -> u16 {
     let r;
     unsafe {
-        llvm_asm!("mov R1,$0"
-             : "=r"(r)
-             :
-             :
-             : "volatile");
+        asm!("mov R1, {0}", out(reg) r);
     }
     r
 }
 
 /// Writes `bits` to the CPU register
 #[inline(always)]
 pub unsafe fn write(bits: u16) {
-    llvm_asm!("mov $0,R1"
-         :
-         : "r"(bits)
-         :
-         : "volatile");
+    asm!("mov {0}, R1", in(reg) bits);
 }

src/register/sr.rs

@@ -1,5 +1,7 @@
 //! Status Register
 
+use crate::asm;
+
 /// Status Register
 #[derive(Clone, Copy, Debug)]
 pub struct Sr {
@@ -77,11 +79,7 @@ impl Sr {
 pub fn read() -> Sr {
     let r: u16;
     unsafe {
-        llvm_asm!("mov R2, $0"
-             : "=r"(r)
-             :
-             :
-             : "volatile");
+        asm!("mov R2, {0}", out(reg) r);
     }
     Sr { bits: r }
 }