Merge pull request #4 from cr1901/new-asm

New asm

Author: pftbest

CHANGELOG.md

@@ -7,15 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-## v0.1.3 - 2021-05-17
+## [v0.1.4] - 2022-01-27
+
+- Use Rust's inline `asm` macro instead of `llvm_asm`; the latter was [removed](https://github.com/rust-lang/rust/pull/92816)
+  from `rustc`.
+
+## [v0.1.3] - 2021-05-17
 
 - Remove `const_fn` feature gate, as it was removed from `rustc` after `v1.53.0`.
 
-## v0.1.2 - 2020-06-09
+## [v0.1.2] - 2020-06-09
 
-- Use llvm_asm instead of asm
+- Use `llvm_asm` instead of `asm`
 
-## v0.1.1 - 2019-12-16
+## [v0.1.1] - 2019-12-16
 
 - Expose AtomicOperations trait for public use
 
@@ -27,5 +32,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Initial release
 
-[Unreleased]: https://github.com/pftbest/msp430-atomic/compare/v0.1.2...HEAD
+[Unreleased]: https://github.com/pftbest/msp430-atomic/compare/v0.1.4...HEAD
+[v0.1.4]: https://github.com/pftbest/msp430-atomic/compare/v0.1.3...v0.1.4
+[v0.1.3]: https://github.com/pftbest/msp430-atomic/compare/v0.1.2...v0.1.3
 [v0.1.2]: https://github.com/pftbest/msp430-atomic/compare/v0.1.1...v0.1.2
+[v0.1.1]: https://github.com/pftbest/msp430-atomic/compare/v0.1.0...v0.1.1

Cargo.toml

@@ -7,4 +7,7 @@ description = "Atomic operations for MSP430 microcontrollers"
 documentation = "https://docs.rs/msp430-atomic"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/pftbest/msp430-atomic"
-version = "0.1.3"
+version = "0.1.4"
+
+[profile.release]
+opt-level = "s"

src/lib.rs

@@ -68,9 +68,10 @@
 //! ```
 
 #![no_std]
-#![feature(llvm_asm)]
+#![feature(asm_experimental_arch)]
 #![cfg_attr(not(target_arch = "msp430"), feature(core_intrinsics))]
 
+use core::arch::asm;
 use core::cell::UnsafeCell;
 use core::fmt;
 
@@ -630,52 +631,44 @@ macro_rules! atomic_int {
         impl AtomicOperations for $int_type {
             #[inline(always)]
             unsafe fn atomic_store(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("mov", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("mov", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
 
             #[inline(always)]
             unsafe fn atomic_load(dst: *const Self) -> Self {
                 let out;
-                llvm_asm!(concat!("mov", $asm_suffix, " $1, $0")
-                    : "=r"(out) : "*m"(dst) : "memory" : "volatile");
+                asm!(concat!("mov", $asm_suffix, " @{0}, {1}"), in(reg) dst, lateout(reg) out);
                 out
             }
 
             #[inline(always)]
             unsafe fn atomic_add(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("add", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("add", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
 
             #[inline(always)]
             unsafe fn atomic_sub(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("sub", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("sub", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
 
             #[inline(always)]
             unsafe fn atomic_and(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("and", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("and", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
 
             #[inline(always)]
             unsafe fn atomic_clear(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("bic", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("bic", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
 
             #[inline(always)]
             unsafe fn atomic_or(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("bis", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("bis", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
 
             #[inline(always)]
             unsafe fn atomic_xor(dst: *mut Self, val: Self) {
-                llvm_asm!(concat!("xor", $asm_suffix, " $1, $0")
-                    :: "*m"(dst), "ir"(val) : "memory" : "volatile");
+                asm!(concat!("xor", $asm_suffix, " {1}, 0({0})"), in(reg) dst, in(reg) val);
             }
         }