aboutsummaryrefslogtreecommitdiff
path: root/macros/src/codegen/software_tasks.rs
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src/codegen/software_tasks.rs')
-rw-r--r--macros/src/codegen/software_tasks.rs181
1 files changed, 78 insertions, 103 deletions
diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs
index 14a57633..4ae37e4e 100644
--- a/macros/src/codegen/software_tasks.rs
+++ b/macros/src/codegen/software_tasks.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
+use quote::{format_ident, quote};
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -13,7 +13,7 @@ pub fn codegen(
analysis: &Analysis,
extra: &Extra,
) -> (
- // const_app_software_tasks -- free queues, buffers and `${task}Resources` constructors
+ // mod_app_software_tasks -- free queues, buffers and `${task}Resources` constructors
Vec<TokenStream2>,
// root_software_tasks -- items that must be placed in the root of the crate:
// - `${task}Locals` structs
@@ -22,14 +22,15 @@ pub fn codegen(
Vec<TokenStream2>,
// user_software_tasks -- the `#[task]` functions written by the user
Vec<TokenStream2>,
+ // user_software_tasks_imports -- the imports for `#[task]` functions written by the user
+ Vec<TokenStream2>,
) {
- let mut const_app = vec![];
+ let mut mod_app = vec![];
let mut root = vec![];
let mut user_tasks = vec![];
+ let mut software_tasks_imports = vec![];
for (name, task) in &app.software_tasks {
- let receiver = task.args.core;
-
let inputs = &task.inputs;
let (_, _, _, input_ty) = util::regroup_inputs(inputs);
@@ -37,103 +38,70 @@ pub fn codegen(
let cap_lit = util::capacity_literal(cap);
let cap_ty = util::capacity_typenum(cap, true);
- // create free queues and inputs / instants buffers
- if let Some(free_queues) = analysis.free_queues.get(name) {
- for (&sender, &ceiling) in free_queues {
- let cfg_sender = util::cfg_core(sender, app.args.cores);
- let fq = util::fq_ident(name, sender);
-
- let (loc, fq_ty, fq_expr, bss, mk_uninit): (
- _,
- _,
- _,
- _,
- Box<dyn Fn() -> Option<_>>,
- ) = if receiver == sender {
- (
- cfg_sender.clone(),
- quote!(rtic::export::SCFQ<#cap_ty>),
- quote!(rtic::export::Queue(unsafe {
- rtic::export::iQueue::u8_sc()
- })),
- util::link_section("bss", sender),
- Box::new(|| util::link_section_uninit(Some(sender))),
- )
- } else {
- let shared = if cfg!(feature = "heterogeneous") {
- Some(quote!(#[rtic::export::shared]))
- } else {
- None
- };
-
- (
- shared,
- quote!(rtic::export::MCFQ<#cap_ty>),
- quote!(rtic::export::Queue(rtic::export::iQueue::u8())),
- None,
- Box::new(|| util::link_section_uninit(None)),
- )
- };
- let loc = &loc;
-
- const_app.push(quote!(
- /// Queue version of a free-list that keeps track of empty slots in
- /// the following buffers
- #loc
- #bss
- static mut #fq: #fq_ty = #fq_expr;
+ // Create free queues and inputs / instants buffers
+ if let Some(&ceiling) = analysis.free_queues.get(name) {
+ let fq = util::fq_ident(name);
+
+ let (fq_ty, fq_expr, mk_uninit): (_, _, Box<dyn Fn() -> Option<_>>) = {
+ (
+ quote!(rtic::export::SCFQ<#cap_ty>),
+ quote!(rtic::export::Queue(unsafe {
+ rtic::export::iQueue::u8_sc()
+ })),
+ Box::new(|| util::link_section_uninit(true)),
+ )
+ };
+ mod_app.push(quote!(
+ /// Queue version of a free-list that keeps track of empty slots in
+ /// the following buffers
+ static mut #fq: #fq_ty = #fq_expr;
+ ));
+
+ // Generate a resource proxy if needed
+ if let Some(ceiling) = ceiling {
+ mod_app.push(quote!(
+ struct #fq<'a> {
+ priority: &'a rtic::export::Priority,
+ }
+ ));
+
+ mod_app.push(util::impl_mutex(
+ extra,
+ &[],
+ false,
+ &fq,
+ fq_ty,
+ ceiling,
+ quote!(&mut #fq),
));
+ }
+
+ let ref elems = (0..cap)
+ .map(|_| quote!(core::mem::MaybeUninit::uninit()))
+ .collect::<Vec<_>>();
- // Generate a resource proxy if needed
- if let Some(ceiling) = ceiling {
- const_app.push(quote!(
- #cfg_sender
- struct #fq<'a> {
- priority: &'a rtic::export::Priority,
- }
- ));
-
- const_app.push(util::impl_mutex(
- extra,
- &[],
- cfg_sender.as_ref(),
- false,
- &fq,
- fq_ty,
- ceiling,
- quote!(&mut #fq),
- ));
- }
-
- let ref elems = (0..cap)
- .map(|_| quote!(core::mem::MaybeUninit::uninit()))
- .collect::<Vec<_>>();
-
- if app.uses_schedule(receiver) {
- let m = extra.monotonic();
- let instants = util::instants_ident(name, sender);
-
- let uninit = mk_uninit();
- const_app.push(quote!(
- #loc
- #uninit
- /// Buffer that holds the instants associated to the inputs of a task
- static mut #instants:
- [core::mem::MaybeUninit<<#m as rtic::Monotonic>::Instant>; #cap_lit] =
- [#(#elems,)*];
- ));
- }
+ if app.uses_schedule() {
+ let m = extra.monotonic();
+ let instants = util::instants_ident(name);
let uninit = mk_uninit();
- let inputs = util::inputs_ident(name, sender);
- const_app.push(quote!(
- #loc
+ mod_app.push(quote!(
#uninit
- /// Buffer that holds the inputs of a task
- static mut #inputs: [core::mem::MaybeUninit<#input_ty>; #cap_lit] =
+ /// Buffer that holds the instants associated to the inputs of a task
+ static mut #instants:
+ [core::mem::MaybeUninit<<#m as rtic::Monotonic>::Instant>; #cap_lit] =
[#(#elems,)*];
));
}
+
+ let uninit = mk_uninit();
+ let inputs = util::inputs_ident(name);
+ mod_app.push(quote!(
+ #uninit
+ /// Buffer that holds the inputs of a task
+ static mut #inputs: [core::mem::MaybeUninit<#input_ty>; #cap_lit] =
+ [#(#elems,)*];
+ ));
}
// `${task}Resources`
@@ -147,23 +115,27 @@ pub fn codegen(
analysis,
);
+ // Add resources to imports
+ let name_res = format_ident!("{}Resources", name);
+ software_tasks_imports.push(quote!(
+ #[allow(non_snake_case)]
+ use super::#name_res;
+ ));
+
root.push(item);
- const_app.push(constructor);
+ mod_app.push(constructor);
}
// `${task}Locals`
let mut locals_pat = None;
if !task.locals.is_empty() {
- let (struct_, pat) =
- locals::codegen(Context::SoftwareTask(name), &task.locals, receiver, app);
+ let (struct_, pat) = locals::codegen(Context::SoftwareTask(name), &task.locals, app);
locals_pat = Some(pat);
root.push(struct_);
}
- let cfg_receiver = util::cfg_core(receiver, app.args.cores);
- let section = util::link_section("text", receiver);
let context = &task.context;
let attrs = &task.attrs;
let cfgs = &task.cfgs;
@@ -173,14 +145,17 @@ pub fn codegen(
#(#attrs)*
#(#cfgs)*
#[allow(non_snake_case)]
- #cfg_receiver
- #section
- fn #name(#(#locals_pat,)* #context: #name::Context #(,#inputs)*) {
+ pub fn #name(#(#locals_pat,)* #context: #name::Context #(,#inputs)*) {
use rtic::Mutex as _;
#(#stmts)*
}
));
+ software_tasks_imports.push(quote!(
+ #(#cfgs)*
+ #[allow(non_snake_case)]
+ use super::#name;
+ ));
root.push(module::codegen(
Context::SoftwareTask(name),
@@ -190,5 +165,5 @@ pub fn codegen(
));
}
- (const_app, root, user_tasks)
+ (mod_app, root, user_tasks, software_tasks_imports)
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-03 17:14:19 +0000