mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-12-24 02:49:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

add binds argument to the interrupt and exception attributes

Browse source
This commit is contained in:
Jorge Aparicio 2019-02-23 21:48:47 +01:00
parent bbdc3221f6
commit d0f33add0a
2 changed files with 85 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
macros/src/codegen.rs
View file

@ -469,6 +469,11 @@ fn post_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok
let device = &app.args.device;
let nvic_prio_bits = quote!(#device::NVIC_PRIO_BITS);
for (name, exception) in &app.exceptions {
let name = if let Some(ref binds) = exception.args.binds {
binds
} else {
name
};
let priority = exception.args.priority;
exprs.push(quote!(assert!(#priority <= (1 << #nvic_prio_bits))));
exprs.push(quote!(p.SCB.set_priority(
@ -1082,9 +1087,10 @@ fn exceptions(ctxt: &mut Context, app: &App, analysis: &Analysis) -> Vec<proc_ma
let attrs = &exception.attrs;
let stmts = &exception.stmts;
let kind = Kind::Exception(ident.clone());
let prelude = prelude(
ctxt,
Kind::Exception(ident.clone()),
kind.clone(),
&exception.args.resources,
&exception.args.spawn,
&exception.args.schedule,
@ -1095,7 +1101,7 @@ fn exceptions(ctxt: &mut Context, app: &App, analysis: &Analysis) -> Vec<proc_ma
let module = module(
ctxt,
Kind::Exception(ident.clone()),
kind,
!exception.args.schedule.is_empty(),
!exception.args.spawn.is_empty(),
app,
@ -1162,14 +1168,14 @@ fn interrupts(
let mut root = vec![];
let mut scoped = vec![];
let device = &app.args.device;
for (ident, interrupt) in &app.interrupts {
let attrs = &interrupt.attrs;
let stmts = &interrupt.stmts;
let kind = Kind::Interrupt(ident.clone());
let prelude = prelude(
ctxt,
Kind::Interrupt(ident.clone()),
kind.clone(),
&interrupt.args.resources,
&interrupt.args.spawn,
&interrupt.args.schedule,
@ -1180,7 +1186,7 @@ fn interrupts(
root.push(module(
ctxt,
Kind::Interrupt(ident.clone()),
kind,
!interrupt.args.schedule.is_empty(),
!interrupt.args.spawn.is_empty(),
app,
@ -1217,9 +1223,6 @@ fn interrupts(
unsafe fn #alias() {
#[inline(always)]
#unsafety fn interrupt() {
// check that this interrupt exists
let _ = #device::interrupt::#ident;
#(#locals)*
#baseline_let
@ -1995,6 +1998,11 @@ fn pre_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Toke
let device = &app.args.device;
let nvic_prio_bits = quote!(#device::NVIC_PRIO_BITS);
for (name, interrupt) in &app.interrupts {
let name = if let Some(ref binds) = interrupt.args.binds {
binds
} else {
name
};
let priority = interrupt.args.priority;
exprs.push(quote!(p.NVIC.enable(#device::Interrupt::#name);));
exprs.push(quote!(assert!(#priority <= (1 << #nvic_prio_bits));));

91
macros/src/syntax.rs
View file

@ -699,6 +699,29 @@ impl Init {
}
}
/// Union of `TaskArgs`, `ExceptionArgs` and `InterruptArgs`
pub struct Args {
pub binds: Option<Ident>,
pub capacity: Option<u8>,
pub priority: u8,
pub resources: Idents,
pub schedule: Idents,
pub spawn: Idents,
}
impl Default for Args {
fn default() -> Self {
Args {
binds: None,
capacity: None,
priority: 1,
resources: Idents::new(),
schedule: Idents::new(),
spawn: Idents::new(),
}
}
}
pub struct Exception {
pub args: ExceptionArgs,
pub attrs: Vec<Attribute>,
@ -708,6 +731,7 @@ pub struct Exception {
}
pub struct ExceptionArgs {
pub binds: Option<Ident>,
pub priority: u8,
pub resources: Idents,
pub schedule: Idents,
@ -716,8 +740,9 @@ pub struct ExceptionArgs {
impl Parse for ExceptionArgs {
fn parse(input: ParseStream<'_>) -> parse::Result<Self> {
parse_args(input, false).map(
|TaskArgs {
parse_args(input, /* binds */ true, /* capacity */ false).map(
|Args {
binds,
priority,
resources,
schedule,
@ -725,6 +750,7 @@ impl Parse for ExceptionArgs {
..
}| {
ExceptionArgs {
binds,
priority,
resources,
schedule,
@ -755,7 +781,7 @@ impl Exception {
}
let span = item.ident.span();
match &*item.ident.to_string() {
match &*args.binds.as_ref().unwrap_or(&item.ident).to_string() {
"MemoryManagement" | "BusFault" | "UsageFault" | "SecureFault" | "SVCall"
| "DebugMonitor" | "PendSV" => {} // OK
"SysTick" => {
@ -893,30 +919,40 @@ pub struct TaskArgs {
pub schedule: Idents,
}
impl Default for TaskArgs {
fn default() -> Self {
TaskArgs {
capacity: None,
priority: 1,
resources: Idents::new(),
schedule: Idents::new(),
spawn: Idents::new(),
}
}
}
impl Parse for TaskArgs {
fn parse(input: ParseStream<'_>) -> parse::Result<Self> {
parse_args(input, true)
parse_args(input, /* binds */ false, /* capacity */ true).map(
|Args {
capacity,
priority,
resources,
schedule,
spawn,
..
}| {
TaskArgs {
capacity,
priority,
resources,
schedule,
spawn,
}
},
)
}
}
// Parser shared by TaskArgs and ExceptionArgs / InterruptArgs
fn parse_args(input: ParseStream<'_>, accept_capacity: bool) -> parse::Result<TaskArgs> {
// Parser shared by ExceptionArgs, InterruptArgs and TaskArgs
fn parse_args(
input: ParseStream<'_>,
accepts_binds: bool,
accepts_capacity: bool,
) -> parse::Result<Args> {
if input.is_empty() {
return Ok(TaskArgs::default());
return Ok(Args::default());
}
let mut binds = None;
let mut capacity = None;
let mut priority = None;
let mut resources = None;
@ -936,7 +972,13 @@ fn parse_args(input: ParseStream<'_>, accept_capacity: bool) -> parse::Result<Ta
let ident_s = ident.to_string();
match &*ident_s {
"capacity" if accept_capacity => {
"binds" if accepts_binds => {
// #ident
let ident = content.parse()?;
binds = Some(ident);
}
"capacity" if accepts_capacity => {
if capacity.is_some() {
return Err(parse::Error::new(
ident.span(),
@ -1052,7 +1094,11 @@ fn parse_args(input: ParseStream<'_>, accept_capacity: bool) -> parse::Result<Ta
_ => {
return Err(parse::Error::new(
ident.span(),
"expected one of: priority, resources, schedule or spawn",
format!(
"expected one of: {}{}priority, resources, schedule or spawn",
if accepts_binds { "binds, " } else { "" },
if accepts_capacity { "capacity, " } else { "" },
),
));
}
}
@ -1065,7 +1111,8 @@ fn parse_args(input: ParseStream<'_>, accept_capacity: bool) -> parse::Result<Ta
let _: Token![,] = content.parse()?;
}
Ok(TaskArgs {
Ok(Args {
binds,
capacity,
priority: priority.unwrap_or(1),
resources: resources.unwrap_or(Idents::new()),