mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

added compiler_fence(Ordering::SeqCst) around critical sections

Browse source
This commit is contained in:
Per Lindgren 2020-06-13 21:07:55 +02:00
parent cfd5f4785e
commit 527bfb6eec
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/export.rs
View file

@ -1,6 +1,6 @@
use core::{ use core::{
cell::Cell, cell::Cell,
sync::atomic::{AtomicBool, Ordering}, sync::atomic::{compiler_fence, AtomicBool, Ordering},
}; };
pub use crate::tq::{NotReady, TimerQueue}; pub use crate::tq::{NotReady, TimerQueue};
@ -129,13 +129,20 @@ pub unsafe fn lock<T, R>(
if current < ceiling { if current < ceiling {
if ceiling == (1 << nvic_prio_bits) { if ceiling == (1 << nvic_prio_bits) {
priority.set(u8::max_value()); priority.set(u8::max_value());
let r = interrupt::free(|_| f(&mut *ptr)); let r = interrupt::free(|_| {
compiler_fence(Ordering::SeqCst);
let r = f(&mut *ptr);
compiler_fence(Ordering::SeqCst);
r
});
priority.set(current); priority.set(current);
r r
} else { } else {
priority.set(ceiling); priority.set(ceiling);
basepri::write(logical2hw(ceiling, nvic_prio_bits)); basepri::write(logical2hw(ceiling, nvic_prio_bits));
compiler_fence(Ordering::SeqCst);
let r = f(&mut *ptr); let r = f(&mut *ptr);
compiler_fence(Ordering::SeqCst);
basepri::write(logical2hw(current, nvic_prio_bits)); basepri::write(logical2hw(current, nvic_prio_bits));
priority.set(current); priority.set(current);
r r
@ -158,7 +165,12 @@ pub unsafe fn lock<T, R>(
if current < ceiling { if current < ceiling {
priority.set(u8::max_value()); priority.set(u8::max_value());
let r = interrupt::free(|_| f(&mut *ptr)); let r = interrupt::free(|_| {
compiler_fence(Ordering::SeqCst);
let r = f(&mut *ptr);
compiler_fence(Ordering::SeqCst);
r
});
priority.set(current); priority.set(current);
r r
} else { } else {