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

Cargo fmt

Browse source
This commit is contained in:
Henrik Tjäder 2020-09-01 14:39:05 +00:00
parent fea6d2facf
commit f151d5871c
11 changed files with 53 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
macros/src/analyze.rs
View file

@ -25,24 +25,21 @@ impl ops::Deref for Analysis {
// Assign an `extern` interrupt to each priority level
pub fn app(analysis: P<analyze::Analysis>, app: &App) -> P<Analysis> {
let mut interrupts = BTreeMap::new();
let priorities = app
.software_tasks
.values()
.filter_map(|task| {
Some(task.args.priority)
})
.chain(analysis.timer_queues.first().map(|tq| tq.priority))
.collect::<BTreeSet<_>>();
let priorities = app
.software_tasks
.values()
.filter_map(|task| Some(task.args.priority))
.chain(analysis.timer_queues.first().map(|tq| tq.priority))
.collect::<BTreeSet<_>>();
if !priorities.is_empty() {
interrupts =
priorities
.iter()
.cloned()
.rev()
.zip(app.extern_interrupts.keys().cloned())
.collect();
}
if !priorities.is_empty() {
interrupts = priorities
.iter()
.cloned()
.rev()
.zip(app.extern_interrupts.keys().cloned())
.collect();
}
P::new(Analysis {
parent: analysis,

17
macros/src/check.rs
View file

@ -4,7 +4,6 @@ use proc_macro2::Span;
use rtic_syntax::{
analyze::Analysis,
ast::{App, CustomArg},
};
use syn::{parse, Path};
@ -51,9 +50,7 @@ pub fn app<'a>(app: &'a App, analysis: &Analysis) -> parse::Result<Extra<'a>> {
// check that external (device-specific) interrupts are not named after known (Cortex-M)
// exceptions
for name in app
.extern_interrupts.keys()
{
for name in app.extern_interrupts.keys() {
let name_s = name.to_string();
match &*name_s {
@ -83,8 +80,7 @@ pub fn app<'a>(app: &'a App, analysis: &Analysis) -> parse::Result<Extra<'a>> {
.collect::<HashSet<_>>();
let need = priorities.len();
let given = app
.extern_interrupts.len();
let given = app.extern_interrupts.len();
if need > given {
let s = {
format!(
@ -131,9 +127,7 @@ pub fn app<'a>(app: &'a App, analysis: &Analysis) -> parse::Result<Extra<'a>> {
},
"peripherals" => match v {
CustomArg::Bool(x) => {
peripherals = if *x { true } else { false }
}
CustomArg::Bool(x) => peripherals = if *x { true } else { false },
/*
CustomArg::UInt(s) if app.args.cores != 1 => {
@ -152,13 +146,12 @@ pub fn app<'a>(app: &'a App, analysis: &Analysis) -> parse::Result<Extra<'a>> {
}
}
*/
_ => {
return Err(parse::Error::new(
k.span(),
//if app.args.cores == 1 {
"unexpected argument value; this should be a boolean",
/*
"unexpected argument value; this should be a boolean",
/*
} else {
"unexpected argument value; this should be an integer"
},

10
macros/src/codegen.rs
View file

@ -35,14 +35,11 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let pre_init_stmts = pre_init::codegen(&app, analysis, extra);
let (const_app_init, root_init, user_init, call_init) =
init::codegen(app, analysis, extra);
let (const_app_init, root_init, user_init, call_init) = init::codegen(app, analysis, extra);
let (const_app_post_init, post_init_stmts) =
post_init::codegen(&app, analysis);
let (const_app_post_init, post_init_stmts) = post_init::codegen(&app, analysis);
let (const_app_idle, root_idle, user_idle, call_idle) =
idle::codegen(app, analysis, extra);
let (const_app_idle, root_idle, user_idle, call_idle) = idle::codegen(app, analysis, extra);
user.push(quote!(
#user_init
@ -84,7 +81,6 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
}
));
let (const_app_resources, mod_resources) = resources::codegen(app, analysis, extra);
let (const_app_hardware_tasks, root_hardware_tasks, user_hardware_tasks) =

12
macros/src/codegen/assertions.rs
View file

@ -11,15 +11,15 @@ pub fn codegen(analysis: &Analysis) -> Vec<TokenStream2> {
// type only on some core (e.g. `#[cfg(core = "0")] use some::Type;`)
//if let Some(types) = analysis.send_types {
for ty in &analysis.send_types {
stmts.push(quote!(rtic::export::assert_send::<#ty>();));
}
for ty in &analysis.send_types {
stmts.push(quote!(rtic::export::assert_send::<#ty>();));
}
//}
//if let Some(types) = analysis.sync_types {
for ty in &analysis.sync_types {
stmts.push(quote!(rtic::export::assert_sync::<#ty>();));
}
for ty in &analysis.sync_types {
stmts.push(quote!(rtic::export::assert_sync::<#ty>();));
}
//}
// if the `schedule` API is used in more than one core then we need to check that the

4
macros/src/codegen/hardware_tasks.rs
View file

@ -29,7 +29,6 @@ pub fn codegen(
let mut user_tasks = vec![];
for (name, task) in &app.hardware_tasks {
let (let_instant, instant) = if app.uses_schedule() {
let m = extra.monotonic();
@ -96,8 +95,7 @@ pub fn codegen(
// `${task}Locals`
let mut locals_pat = None;
if !task.locals.is_empty() {
let (struct_, pat) =
locals::codegen(Context::HardwareTask(name), &task.locals, app);
let (struct_, pat) = locals::codegen(Context::HardwareTask(name), &task.locals, app);
root.push(struct_);
locals_pat = Some(pat);

18
macros/src/codegen/init.rs
View file

@ -40,17 +40,15 @@ pub fn codegen(
.late_resources
.iter()
.flat_map(|resources| {
resources
.iter()
.map(|name| {
let ty = &app.late_resources[name].ty;
let cfgs = &app.late_resources[name].cfgs;
resources.iter().map(|name| {
let ty = &app.late_resources[name].ty;
let cfgs = &app.late_resources[name].cfgs;
quote!(
#(#cfgs)*
pub #name: #ty
)
})
quote!(
#(#cfgs)*
pub #name: #ty
)
})
})
.collect::<Vec<_>>();

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

@ -5,17 +5,14 @@ use rtic_syntax::ast::App;
use crate::analyze::Analysis;
/// Generates code that runs after `#[init]` returns
pub fn codegen(
app: &App,
analysis: &Analysis,
) -> (Vec<TokenStream2>, Vec<TokenStream2>) {
pub fn codegen(app: &App, analysis: &Analysis) -> (Vec<TokenStream2>, Vec<TokenStream2>) {
//#TODO remove
let const_app = vec![];
let mut stmts = vec![];
// initialize late resources
//if let Some(late_resources) = analysis.late_resources {
//for name in late_resources {
//for name in late_resources {
if analysis.late_resources.len() > 0 {
// #TODO, check soundness of this, why the wrapping
// BTreeSet wrapped in a vector

9
macros/src/codegen/pre_init.rs
View file

@ -5,14 +5,7 @@ use rtic_syntax::ast::App;
use crate::{analyze::Analysis, check::Extra, codegen::util};
/// Generates code that runs before `#[init]`
pub fn codegen(
app: &App,
analysis: &Analysis,
extra: &Extra,
) ->
// `pre_init_stmts`
Vec<TokenStream2>
{
pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream2> {
let mut stmts = vec![];
// disable interrupts -- `init` must run with interrupts disabled

14
macros/src/codegen/resources.rs
View file

@ -1,9 +1,6 @@
use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use rtic_syntax::{
analyze::Ownership,
ast::App,
};
use rtic_syntax::{analyze::Ownership, ast::App};
use crate::{analyze::Analysis, check::Extra, codegen::util};
@ -28,10 +25,10 @@ pub fn codegen(
{
//let loc_attr = None;
let section = if expr.is_none() {
util::link_section_uninit(true)
} else {
None
};
util::link_section_uninit(true)
} else {
None
};
/*
let (loc_attr, section) = match loc {
Location::Owned => (
@ -66,7 +63,6 @@ pub fn codegen(
}
if let Some(Ownership::Contended { ceiling }) = analysis.ownerships.get(name) {
mod_resources.push(quote!(
#[allow(non_camel_case_types)]
#(#cfgs)*

3
macros/src/codegen/spawn_body.rs
View file

@ -45,7 +45,8 @@ pub fn codegen(
let device = extra.device;
let enum_ = util::interrupt_ident();
let interrupt = &analysis.interrupts.get(&priority);
let pend = {quote!(
let pend = {
quote!(
rtic::pend(#device::#enum_::#interrupt);
)
};

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

@ -44,10 +44,7 @@ pub fn cfg_core(core: Core, cores: u8) -> Option<TokenStream2> {
/// There may be more than one free queue per task because we need one for each sender core so we
/// include the sender (e.g. `S0`) in the name
pub fn fq_ident(task: &Ident) -> Ident {
Ident::new(
&format!("{}_FQ", task.to_string()),
Span::call_site(),
)
Ident::new(&format!("{}_FQ", task.to_string()), Span::call_site())
}
/// Generates a `Mutex` implementation
@ -112,7 +109,7 @@ pub fn instants_ident(task: &Ident) -> Ident {
pub fn interrupt_ident() -> Ident {
let span = Span::call_site();
Ident::new("Interrupt", span)
Ident::new("Interrupt", span)
}
/// Whether `name` is an exception with configurable priority
@ -253,10 +250,7 @@ pub fn resources_ident(ctxt: Context, app: &App) -> Ident {
/// in turn may use more than one ready queue because the queues are SPSC queues so one is needed
/// per sender core.
pub fn rq_ident(priority: u8) -> Ident {
Ident::new(
&format!("P{}_RQ", priority),
Span::call_site(),
)
Ident::new(&format!("P{}_RQ", priority), Span::call_site())
}
/// Generates an identifier for a "schedule" function
@ -264,10 +258,7 @@ pub fn rq_ident(priority: u8) -> Ident {
/// The methods of the `Schedule` structs invoke these functions. As one task may be `schedule`-ed
/// by different cores we need one "schedule" function per possible task-sender pair
pub fn schedule_ident(name: &Ident) -> Ident {
Ident::new(
&format!("schedule_{}", name.to_string()),
Span::call_site(),
)
Ident::new(&format!("schedule_{}", name.to_string()), Span::call_site())
}
/// Generates an identifier for the `enum` of `schedule`-able tasks
@ -287,10 +278,7 @@ pub fn spawn_barrier() -> Ident {
/// The methods of the `Spawn` structs invoke these functions. As one task may be `spawn`-ed by
/// different cores we need one "spawn" function per possible task-sender pair
pub fn spawn_ident(name: &Ident) -> Ident {
Ident::new(
&format!("spawn_{}", name.to_string()),
Span::call_site(),
)
Ident::new(&format!("spawn_{}", name.to_string()), Span::call_site())
}
/// Generates an identifier for the `enum` of `spawn`-able tasks
@ -298,10 +286,7 @@ pub fn spawn_ident(name: &Ident) -> Ident {
/// This identifier needs the same structure as the `RQ` identifier because there's one ready queue
/// for each of these `T` enums
pub fn spawn_t_ident(priority: u8) -> Ident {
Ident::new(
&format!("P{}_T", priority),
Span::call_site(),
)
Ident::new(&format!("P{}_T", priority), Span::call_site())
}
pub fn suffixed(name: &str) -> Ident {