diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs index 83e5026670..117bce8cf6 100644 --- a/macros/src/codegen.rs +++ b/macros/src/codegen.rs @@ -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 Vec 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));)); diff --git a/macros/src/syntax.rs b/macros/src/syntax.rs index 9771ea922e..ee03b2f5a3 100644 --- a/macros/src/syntax.rs +++ b/macros/src/syntax.rs @@ -699,6 +699,29 @@ impl Init { } } +/// Union of `TaskArgs`, `ExceptionArgs` and `InterruptArgs` +pub struct Args { + pub binds: Option, + pub capacity: Option, + 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, @@ -708,6 +731,7 @@ pub struct Exception { } pub struct ExceptionArgs { + pub binds: Option, 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 { - 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 { - 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 { +// Parser shared by ExceptionArgs, InterruptArgs and TaskArgs +fn parse_args( + input: ParseStream<'_>, + accepts_binds: bool, + accepts_capacity: bool, +) -> parse::Result { 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 { + "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 { 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