mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2025-12-19 22:35:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Masks take 3

Browse source
This commit is contained in:
Emil Fresk 2022-04-20 10:46:03 +02:00
parent 8707418003
commit 9f38a39377
4 changed files with 62 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

40
macros/src/codegen/shared_resources.rs
View file

@ -1,8 +1,8 @@
use crate::{analyze::Analysis, check::Extra, codegen::util};
use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use rtic_syntax::{analyze::Ownership, ast::App};
use crate::{analyze::Analysis, check::Extra, codegen::util};
use std::collections::HashMap;
/// Generates `static` variables and shared resource proxies
pub fn codegen(
@ -108,14 +108,9 @@ pub fn codegen(
// Computing mapping of used interrupts to masks
let interrupt_ids = analysis.interrupts.iter().map(|(p, (id, _))| (p, id));
use std::collections::HashMap;
let mut masks: HashMap<u8, _> = std::collections::HashMap::new();
let mut prio_to_masks = HashMap::new();
let device = &extra.device;
for p in 0..3 {
masks.insert(p, quote!(0));
}
for (&priority, name) in interrupt_ids.chain(app.hardware_tasks.values().flat_map(|task| {
if !util::is_exception(&task.args.binds) {
Some((&task.args.priority, &task.args.binds))
@ -124,18 +119,31 @@ pub fn codegen(
None
}
})) {
let name = quote!(#device::Interrupt::#name as u32);
if let Some(v) = masks.get_mut(&(priority - 1)) {
*v = quote!(#v | 1 << #name);
};
let v = prio_to_masks.entry(priority - 1).or_insert(Vec::new());
v.push(quote!(#device::Interrupt::#name as u32));
}
let mut mask_arr: Vec<(_, _)> = masks.iter().collect();
mask_arr.sort_by_key(|(k, _v)| *k);
let mask_arr: Vec<_> = mask_arr.iter().map(|(_, v)| v).collect();
// Call rtic::export::create_mask([u32; N]), where the array is the list of shifts
let mut mask_arr = Vec::new();
// NOTE: 0..3 assumes max 4 priority levels according to M0 spec
for i in 0..3 {
let v = if let Some(v) = prio_to_masks.get(&i) {
v.clone()
} else {
Vec::new()
};
mask_arr.push(quote!(
rtic::export::create_mask([#(#v),*])
));
}
let masks_name = util::priority_masks_ident();
mod_app.push(quote!(
const MASKS: [u32; 3] = [#(#mask_arr),*];
#[doc(hidden)]
#[allow(non_camel_case_types)]
const #masks_name: [u32; 3] = [#(#mask_arr),*];
));
(mod_app, mod_resources)

7
macros/src/codegen/util.rs
View file

@ -36,6 +36,7 @@ pub fn impl_mutex(
};
let device = &extra.device;
let masks_name = priority_masks_ident();
quote!(
#(#cfgs)*
impl<'a> rtic::Mutex for #path<'a> {
@ -52,7 +53,7 @@ pub fn impl_mutex(
#priority,
CEILING,
#device::NVIC_PRIO_BITS,
&MASKS,
&#masks_name,
f,
)
}
@ -252,6 +253,10 @@ pub fn static_shared_resource_ident(name: &Ident) -> Ident {
mark_internal_name(&format!("shared_resource_{}", name))
}
pub fn priority_masks_ident() -> Ident {
mark_internal_name("MASKS")
}
pub fn static_local_resource_ident(name: &Ident) -> Ident {
mark_internal_name(&format!("local_resource_{}", name))
}