Skip to content

Use core atomic types instead of intrinsics on non-MSP430 targets #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 12, 2022
Merged

Use core atomic types instead of intrinsics on non-MSP430 targets #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
//! ```
#![no_std]
#![feature(asm_experimental_arch)]
#![cfg_attr(not(target_arch = "msp430"), feature(core_intrinsics))]
#![cfg_attr(target_arch = "msp430", feature(asm_experimental_arch))]

#[cfg(target_arch = "msp430")]
use core::arch::asm;
use core::cell::UnsafeCell;
use core::fmt;
Expand Down Expand Up @@ -681,42 +681,50 @@ macro_rules! atomic_int {
impl AtomicOperations for $int_type {
#[inline(always)]
unsafe fn atomic_store(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_store(dst, val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.store(val, ::core::sync::atomic::Ordering::SeqCst);
}

#[inline(always)]
unsafe fn atomic_load(dst: *const Self) -> Self {
::core::intrinsics::atomic_load(dst)
(*(dst as *const ::core::sync::atomic::$atomic_type))
.load(::core::sync::atomic::Ordering::SeqCst)
}

#[inline(always)]
unsafe fn atomic_add(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_xadd(dst, val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.fetch_add(val, ::core::sync::atomic::Ordering::SeqCst);
}

#[inline(always)]
unsafe fn atomic_sub(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_xsub(dst, val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.fetch_sub(val, ::core::sync::atomic::Ordering::SeqCst);
}

#[inline(always)]
unsafe fn atomic_and(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_and(dst, val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.fetch_and(val, ::core::sync::atomic::Ordering::SeqCst);
}

#[inline(always)]
unsafe fn atomic_clear(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_and(dst, !val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.fetch_and(!val, ::core::sync::atomic::Ordering::SeqCst);
}

#[inline(always)]
unsafe fn atomic_or(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_or(dst, val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.fetch_or(val, ::core::sync::atomic::Ordering::SeqCst);
}

#[inline(always)]
unsafe fn atomic_xor(dst: *mut Self, val: Self) {
::core::intrinsics::atomic_xor(dst, val);
(*(dst as *const ::core::sync::atomic::$atomic_type))
.fetch_xor(val, ::core::sync::atomic::Ordering::SeqCst);
}
}
}
Expand Down