From f3b397f460bf06ee843bd429d332bb04768e99d6 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 23 Jul 2017 20:51:37 -0500 Subject: [PATCH] drop rtfm::Cell --- macros/src/trans.rs | 54 +++++++++++++++++++++++++++------------------ src/lib.rs | 42 ++++++----------------------------- 2 files changed, 40 insertions(+), 56 deletions(-) diff --git a/macros/src/trans.rs b/macros/src/trans.rs index 27929930f4..293c8d2c9d 100644 --- a/macros/src/trans.rs +++ b/macros/src/trans.rs @@ -11,6 +11,7 @@ pub fn app(app: &App, ownerships: &Ownerships) -> Tokens { let mut root = vec![]; let mut main = vec![]; + ::trans::check(app, &mut main); ::trans::init(app, &mut main, &mut root); ::trans::idle(app, ownerships, &mut main, &mut root); ::trans::resources(app, ownerships, &mut root); @@ -26,6 +27,22 @@ pub fn app(app: &App, ownerships: &Ownerships) -> Tokens { quote!(#(#root)*) } +fn check(app: &App, main: &mut Vec) { + if !app.resources.is_empty() { + main.push(quote! { + fn is_send() where T: Send {} + }); + } + + for resource in app.resources.values() { + let ty = &resource.ty; + + main.push(quote! { + is_send::<#ty>(); + }); + } +} + fn idle( app: &App, ownerships: &Ownerships, @@ -79,7 +96,7 @@ fn idle( rexprs.push(quote! { #name: #krate::Static::ref_mut( - &mut *#super_::#name.get(), + &mut #super_::#name, ), }); } else { @@ -180,7 +197,7 @@ fn init(app: &App, main: &mut Vec, root: &mut Vec) { }); rexprs.push(quote! { - #name: ::#krate::Static::ref_mut(&mut *super::#name.get()), + #name: ::#krate::Static::ref_mut(&mut super::#name), }); } @@ -288,14 +305,12 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { match *ownership { Ownership::Owned { .. } => { if let Some(resource) = app.resources.get(name) { - // For owned resources we don't need claim() or borrow(), - // just get() + // For owned resources we don't need claim() or borrow() let expr = &resource.expr; let ty = &resource.ty; root.push(quote! { - static #name: #krate::Cell<#ty> = - #krate::Cell::new(#expr); + static mut #name: #ty = #expr; }); } else { // Peripheral @@ -308,8 +323,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { let ty = &resource.ty; root.push(quote! { - static #name: #krate::Cell<#ty> = - #krate::Cell::new(#expr); + static mut #name: #ty = #expr; }); impl_items.push(quote! { @@ -319,7 +333,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { &'cs self, _cs: &'cs #krate::CriticalSection, ) -> &'cs #krate::Static<#ty> { - unsafe { #krate::Static::ref_(&*#name.get()) } + unsafe { #krate::Static::ref_(&#name) } } fn borrow_mut<'cs>( @@ -327,7 +341,7 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { _cs: &'cs #krate::CriticalSection, ) -> &'cs mut #krate::Static<#ty> { unsafe { - #krate::Static::ref_mut(&mut *#name.get()) + #krate::Static::ref_mut(&mut #name) } } @@ -343,12 +357,11 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { { unsafe { #krate::claim( - #name.get(), + #krate::Static::ref_(&#name), #ceiling, #device::NVIC_PRIO_BITS, t, f, - |data| #krate::Static::ref_(&*data), ) } } @@ -365,12 +378,11 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { { unsafe { #krate::claim( - #name.get(), + #krate::Static::ref_mut(&mut #name), #ceiling, #device::NVIC_PRIO_BITS, t, f, - |data| #krate::Static::ref_mut(&mut *data), ) } } @@ -411,12 +423,13 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { { unsafe { #krate::claim( - #device::#name.get(), + #krate::Static::ref_( + &*#device::#name.get(), + ), #ceiling, #device::NVIC_PRIO_BITS, t, f, - |data| #krate::Static::ref_(&*data), ) } } @@ -433,12 +446,13 @@ fn resources(app: &App, ownerships: &Ownerships, root: &mut Vec) { { unsafe { #krate::claim( - #device::#name.get(), + #krate::Static::ref_mut( + &mut *#device::#name.get(), + ), #ceiling, #device::NVIC_PRIO_BITS, t, f, - |data| #krate::Static::ref_mut(&mut *data), ) } } @@ -512,9 +526,7 @@ fn tasks(app: &App, ownerships: &Ownerships, root: &mut Vec) { }); exprs.push(quote! { - #name: ::#krate::Static::ref_mut( - &mut *super::#name.get(), - ), + #name: ::#krate::Static::ref_mut(&mut super::#name), }); } else { fields.push(quote! { diff --git a/src/lib.rs b/src/lib.rs index 710e0d4d45..f80ac126b9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -63,8 +63,6 @@ extern crate cortex_m; extern crate cortex_m_rtfm_macros; extern crate static_ref; -use core::cell::UnsafeCell; - pub use cortex_m::asm::{bkpt, wfi}; pub use cortex_m::interrupt::CriticalSection; pub use cortex_m::interrupt::free as atomic; @@ -137,68 +135,42 @@ impl Resource for Static { } #[doc(hidden)] -pub unsafe fn claim( - data: *mut T, +pub unsafe fn claim( + data: T, ceiling: u8, nvic_prio_bits: u8, t: &mut Threshold, f: F, - g: G, ) -> R where - F: FnOnce(U, &mut Threshold) -> R, - G: FnOnce(*mut T) -> U, + F: FnOnce(T, &mut Threshold) -> R, { let max_priority = 1 << nvic_prio_bits; if ceiling > t.value { match () { #[cfg(armv6m)] () => { - atomic(|_| f(g(data), &mut Threshold::new(max_priority))) + atomic(|_| f(data, &mut Threshold::new(max_priority))) } #[cfg(not(armv6m))] () => { if ceiling == max_priority { - atomic(|_| f(g(data), &mut Threshold::new(max_priority))) + atomic(|_| f(data, &mut Threshold::new(max_priority))) } else { let old = basepri::read(); let hw = (max_priority - ceiling) << (8 - nvic_prio_bits); basepri_max::write(hw); - let ret = f(g(data), &mut Threshold::new(ceiling)); + let ret = f(data, &mut Threshold::new(ceiling)); basepri::write(old); ret } } } } else { - f(g(data), t) + f(data, t) } } -#[doc(hidden)] -pub struct Cell { - data: UnsafeCell, -} - -#[doc(hidden)] -impl Cell { - pub const fn new(data: T) -> Self { - Cell { - data: UnsafeCell::new(data), - } - } - - pub fn get(&self) -> *mut T { - self.data.get() - } -} - -unsafe impl Sync for Cell -where - T: Send, -{ -} - /// Preemption threshold token /// /// The preemption threshold indicates the priority a task must have to preempt