diff options
| -rw-r--r-- | src/lib.rs | 8 | ||||
| -rw-r--r-- | tests/cfail/ceiling.rs | 15 |
2 files changed, 19 insertions, 4 deletions
@@ -110,7 +110,7 @@ impl<T, CEILING> Resource<T, C<CEILING>> { /// [Resource.borrow](struct.Resource.html#method.borrow). #[cfg(not(thumbv6m))] pub fn lock<R, PRIORITY, F>(&'static self, _priority: &P<PRIORITY>, f: F) -> R - where F: FnOnce(Ref<T>, C<CEILING>) -> R, + where F: FnOnce(Ref<T>, &C<CEILING>) -> R, CEILING: Cmp<PRIORITY, Output = Greater> + Cmp<UMAX, Output = Less> + Level { unsafe { @@ -118,7 +118,7 @@ impl<T, CEILING> Resource<T, C<CEILING>> { basepri_max::write(<CEILING>::hw()); barrier!(); let ret = - f(Ref::new(&*self.data.get()), C { _marker: PhantomData }); + f(Ref::new(&*self.data.get()), &C { _marker: PhantomData }); barrier!(); basepri::write(old_basepri); ret @@ -209,7 +209,7 @@ impl<Periph, CEILING> Peripheral<Periph, C<CEILING>> { /// See [Resource.lock](./struct.Resource.html#method.lock) #[cfg(not(thumbv6m))] pub fn lock<R, PRIORITY, F>(&'static self, _priority: &P<PRIORITY>, f: F) -> R - where F: FnOnce(Ref<Periph>, C<CEILING>) -> R, + where F: FnOnce(Ref<Periph>, &C<CEILING>) -> R, CEILING: Cmp<PRIORITY, Output = Greater> + Cmp<UMAX, Output = Less> + Level { unsafe { @@ -218,7 +218,7 @@ impl<Periph, CEILING> Peripheral<Periph, C<CEILING>> { barrier!(); let ret = f( Ref::new(&*self.peripheral.get()), - C { _marker: PhantomData }, + &C { _marker: PhantomData }, ); barrier!(); basepri::write(old_basepri); diff --git a/tests/cfail/ceiling.rs b/tests/cfail/ceiling.rs new file mode 100644 index 0000000..9ddce53 --- /dev/null +++ b/tests/cfail/ceiling.rs @@ -0,0 +1,15 @@ +extern crate cortex_m_srp; + +use cortex_m_srp::{C3, P2, Resource}; + +static R1: Resource<(), C3> = Resource::new(()); + +fn j1(prio: P2) { + let c3 = R1.lock(&prio, |r1, c3| { + // forbidden: ceiling token can't outlive critical section + c3 //~ error + }); + + // Would be bad: lockless access to a resource with ceiling = 3 + let r2 = R1.borrow(&prio, c3); +} |