aboutsummaryrefslogtreecommitdiff
path: root/macros/src
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src')
-rw-r--r--macros/src/codegen.rs85
-rw-r--r--macros/src/codegen/dispatchers.rs4
-rw-r--r--macros/src/codegen/hardware_tasks.rs24
-rw-r--r--macros/src/codegen/idle.rs24
-rw-r--r--macros/src/codegen/init.rs30
-rw-r--r--macros/src/codegen/resources.rs7
-rw-r--r--macros/src/codegen/resources_struct.rs11
-rw-r--r--macros/src/codegen/software_tasks.rs19
-rw-r--r--macros/src/codegen/util.rs8
9 files changed, 75 insertions, 137 deletions
diff --git a/macros/src/codegen.rs b/macros/src/codegen.rs
index 0cff5bbc..c38b47c9 100644
--- a/macros/src/codegen.rs
+++ b/macros/src/codegen.rs
@@ -22,35 +22,20 @@ mod util;
// TODO document the syntax here or in `rtic-syntax`
pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
let mut mod_app = vec![];
- let mut mod_app_imports = vec![];
let mut mains = vec![];
let mut root = vec![];
let mut user = vec![];
- let mut imports = vec![];
// Generate the `main` function
let assertion_stmts = assertions::codegen(analysis);
let pre_init_stmts = pre_init::codegen(&app, analysis, extra);
- let (mod_app_init, root_init, user_init, user_init_imports, call_init) =
- init::codegen(app, analysis, extra);
+ let (mod_app_init, root_init, user_init, call_init) = init::codegen(app, analysis, extra);
let post_init_stmts = post_init::codegen(&app, analysis);
- let (mod_app_idle, root_idle, user_idle, user_idle_imports, call_idle) =
- idle::codegen(app, analysis, extra);
-
- if user_init.is_some() {
- mod_app_imports.push(quote!(
- use super::init;
- ))
- }
- if user_idle.is_some() {
- mod_app_imports.push(quote!(
- use super::idle;
- ))
- }
+ let (mod_app_idle, root_idle, user_idle, call_idle) = idle::codegen(app, analysis, extra);
user.push(quote!(
#user_init
@@ -58,11 +43,6 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
#user_idle
));
- imports.push(quote!(
- #(#user_init_imports)*
- #(#user_idle_imports)*
- ));
-
root.push(quote!(
#(#root_init)*
@@ -100,15 +80,10 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
mod_app_hardware_tasks,
root_hardware_tasks,
user_hardware_tasks,
- user_hardware_tasks_imports,
) = hardware_tasks::codegen(app, analysis, extra);
- let (
- mod_app_software_tasks,
- root_software_tasks,
- user_software_tasks,
- user_software_tasks_imports,
- ) = software_tasks::codegen(app, analysis, extra);
+ let (mod_app_software_tasks, root_software_tasks, user_software_tasks) =
+ software_tasks::codegen(app, analysis, extra);
let mod_app_dispatchers = dispatchers::codegen(app, analysis, extra);
let mod_app_timer_queue = timer_queue::codegen(app, analysis, extra);
@@ -131,54 +106,66 @@ pub fn app(app: &App, analysis: &Analysis, extra: &Extra) -> TokenStream2 {
}
quote!(
- #(#user)*
-
- #(#user_hardware_tasks)*
-
- #(#user_software_tasks)*
-
- #(#root)*
-
- #mod_resources
-
- #(#root_hardware_tasks)*
-
- #(#root_software_tasks)*
-
- /// Unused
- #(#tasks)*
-
/// Implementation details
mod #name {
/// Always include the device crate which contains the vector table
use #device as you_must_enable_the_rt_feature_for_the_pac_in_your_cargo_toml;
- #(#imports)*
+
+ /// 2
#(#user_imports)*
/// User code from within the module
#(#user_code)*
/// User code end
+ /// 3
+ #(#user)*
+
+ /// 4
+ #(#user_hardware_tasks)*
+
+ /// 5
+ #(#user_software_tasks)*
+
+ /// 6
+ #(#root)*
+
+ /// 7
+ #mod_resources
+
+ /// 8
+ #(#root_hardware_tasks)*
- #(#user_hardware_tasks_imports)*
+ /// 9
+ #(#root_software_tasks)*
- #(#user_software_tasks_imports)*
+ /// 10
+ /// Unused
+ #(#tasks)*
+ /// 13
#(#mod_resources_imports)*
+ /// 14
/// app module
#(#mod_app)*
+ /// 15
#(#mod_app_resources)*
+ /// 16
#(#mod_app_hardware_tasks)*
+ /// 17
#(#mod_app_software_tasks)*
+ /// 18
#(#mod_app_dispatchers)*
+ /// 19
#(#mod_app_timer_queue)*
+ /// 20
#(#mains)*
}
)
diff --git a/macros/src/codegen/dispatchers.rs b/macros/src/codegen/dispatchers.rs
index bf6986b8..bd4061d1 100644
--- a/macros/src/codegen/dispatchers.rs
+++ b/macros/src/codegen/dispatchers.rs
@@ -90,6 +90,8 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
quote!(#name::Locals::new(),)
};
+ let app_name = &app.name;
+ let app_path = quote! {crate::#app_name};
quote!(
#(#cfgs)*
#t::#name => {
@@ -98,7 +100,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
#let_instant
#fq.split().0.enqueue_unchecked(index);
let priority = &rtic::export::Priority::new(PRIORITY);
- crate::#name(
+ #app_path::#name(
#locals_new
#name::Context::new(priority #instant)
#(,#pats)*
diff --git a/macros/src/codegen/hardware_tasks.rs b/macros/src/codegen/hardware_tasks.rs
index ebfa69b9..e6fa5ed1 100644
--- a/macros/src/codegen/hardware_tasks.rs
+++ b/macros/src/codegen/hardware_tasks.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -23,13 +23,10 @@ pub fn codegen(
Vec<TokenStream2>,
// user_hardware_tasks -- the `#[task]` functions written by the user
Vec<TokenStream2>,
- // user_hardware_tasks_imports -- the imports for `#[task]` functions written by the user
- Vec<TokenStream2>,
) {
let mut mod_app = vec![];
let mut root = vec![];
let mut user_tasks = vec![];
- let mut hardware_tasks_imports = vec![];
for (name, task) in &app.hardware_tasks {
let (let_instant, instant) = if let Some(m) = extra.monotonic {
@@ -50,6 +47,8 @@ pub fn codegen(
let symbol = task.args.binds.clone();
let priority = task.args.priority;
+ let app_name = &app.name;
+ let app_path = quote! {crate::#app_name};
mod_app.push(quote!(
#[allow(non_snake_case)]
#[no_mangle]
@@ -59,7 +58,7 @@ pub fn codegen(
#let_instant
rtic::export::run(PRIORITY, || {
- crate::#name(
+ #app_path::#name(
#locals_new
#name::Context::new(&rtic::export::Priority::new(PRIORITY) #instant)
)
@@ -79,13 +78,6 @@ pub fn codegen(
analysis,
);
- // Add resources to imports
- let name_res = format_ident!("{}Resources", name);
- hardware_tasks_imports.push(quote!(
- #[allow(non_snake_case)]
- use super::#name_res;
- ));
-
root.push(item);
mod_app.push(constructor);
@@ -121,13 +113,7 @@ pub fn codegen(
#(#stmts)*
}
));
-
- hardware_tasks_imports.push(quote!(
- #(#attrs)*
- #[allow(non_snake_case)]
- use super::#name;
- ));
}
- (mod_app, root, user_tasks, hardware_tasks_imports)
+ (mod_app, root, user_tasks)
}
diff --git a/macros/src/codegen/idle.rs b/macros/src/codegen/idle.rs
index 5e73329f..10196806 100644
--- a/macros/src/codegen/idle.rs
+++ b/macros/src/codegen/idle.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -23,8 +23,6 @@ pub fn codegen(
Vec<TokenStream2>,
// user_idle
Option<TokenStream2>,
- // user_idle_imports
- Vec<TokenStream2>,
// call_idle
TokenStream2,
) {
@@ -36,8 +34,6 @@ pub fn codegen(
let mut locals_pat = None;
let mut locals_new = None;
- let mut user_idle_imports = vec![];
-
let name = &idle.name;
if !idle.args.resources.is_empty() {
@@ -46,12 +42,6 @@ pub fn codegen(
root_idle.push(item);
mod_app = Some(constructor);
-
- let name_resource = format_ident!("{}Resources", name);
- user_idle_imports.push(quote!(
- #[allow(non_snake_case)]
- use super::#name_resource;
- ));
}
if !idle.locals.is_empty() {
@@ -83,25 +73,21 @@ pub fn codegen(
#(#stmts)*
}
));
- user_idle_imports.push(quote!(
- #(#attrs)*
- #[allow(non_snake_case)]
- use super::#name;
- ));
+ let app_name = &app.name;
+ let app_path = quote! {crate::#app_name};
let locals_new = locals_new.iter();
- let call_idle = quote!(crate::#name(
+ let call_idle = quote!(#app_path::#name(
#(#locals_new,)*
#name::Context::new(&rtic::export::Priority::new(0))
));
- (mod_app, root_idle, user_idle, user_idle_imports, call_idle)
+ (mod_app, root_idle, user_idle, call_idle)
} else {
(
None,
vec![],
None,
- vec![],
quote!(loop {
rtic::export::wfi()
}),
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index 465a927d..922e43b5 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -1,5 +1,5 @@
use proc_macro2::TokenStream as TokenStream2;
-use quote::{format_ident, quote};
+use quote::quote;
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -24,8 +24,6 @@ pub fn codegen(
Vec<TokenStream2>,
// user_init -- the `#[init]` function written by the user
Option<TokenStream2>,
- // user_init_imports -- the imports for `#[init]` functio written by the user
- Vec<TokenStream2>,
// call_init -- the call to the user `#[init]` if there's one
Option<TokenStream2>,
) {
@@ -52,7 +50,6 @@ pub fn codegen(
})
.collect::<Vec<_>>();
- let mut user_init_imports = vec![];
let late_resources = util::late_resources_ident(&name);
root_init.push(quote!(
@@ -63,12 +60,6 @@ pub fn codegen(
}
));
- let name_late = format_ident!("{}LateResources", name);
- user_init_imports.push(quote!(
- #[allow(non_snake_case)]
- use super::#name_late;
- ));
-
let mut locals_pat = None;
let mut locals_new = None;
if !init.locals.is_empty() {
@@ -90,11 +81,6 @@ pub fn codegen(
#(#stmts)*
}
));
- user_init_imports.push(quote!(
- #(#attrs)*
- #[allow(non_snake_case)]
- use super::#name;
- ));
let mut mod_app = None;
if !init.args.resources.is_empty() {
@@ -103,17 +89,13 @@ pub fn codegen(
root_init.push(item);
mod_app = Some(constructor);
-
- let name_late = format_ident!("{}Resources", name);
- user_init_imports.push(quote!(
- #[allow(non_snake_case)]
- use super::#name_late;
- ));
}
+ let app_name = &app.name;
+ let app_path = quote! {crate::#app_name};
let locals_new = locals_new.iter();
let call_init = Some(
- quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));),
+ quote!(let late = #app_path::#name(#(#locals_new,)* #name::Context::new(core.into()));),
);
root_init.push(module::codegen(
@@ -124,8 +106,8 @@ pub fn codegen(
extra,
));
- (mod_app, root_init, user_init, user_init_imports, call_init)
+ (mod_app, root_init, user_init, call_init)
} else {
- (None, vec![], None, vec![], None)
+ (None, vec![], None, None)
}
}
diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index 38ea5245..d5ec583e 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -24,6 +24,7 @@ pub fn codegen(
for (name, res, expr, _) in app.resources(analysis) {
let cfgs = &res.cfgs;
let ty = &res.ty;
+ let mangled_name = util::mangle_ident(&name);
{
let section = if expr.is_none() {
@@ -47,7 +48,7 @@ pub fn codegen(
#(#attrs)*
#(#cfgs)*
#section
- static mut #name: #ty = #expr;
+ static mut #mangled_name: #ty = #expr;
));
}
@@ -76,12 +77,12 @@ pub fn codegen(
let ptr = if expr.is_none() {
quote!(
#(#cfgs)*
- #name.as_mut_ptr()
+ #mangled_name.as_mut_ptr()
)
} else {
quote!(
#(#cfgs)*
- &mut #name
+ &mut #mangled_name
)
};
diff --git a/macros/src/codegen/resources_struct.rs b/macros/src/codegen/resources_struct.rs
index 92d5b666..ffc72757 100644
--- a/macros/src/codegen/resources_struct.rs
+++ b/macros/src/codegen/resources_struct.rs
@@ -36,6 +36,7 @@ pub fn codegen(
None
};
let ty = &res.ty;
+ let mangled_name = util::mangle_ident(&name);
if ctxt.is_init() {
if !analysis.ownerships.contains_key(name) {
@@ -47,7 +48,7 @@ pub fn codegen(
values.push(quote!(
#(#cfgs)*
- #name: &#mut_ #name
+ #name: &#mut_ #mangled_name
));
} else {
// Owned by someone else
@@ -60,7 +61,7 @@ pub fn codegen(
values.push(quote!(
#(#cfgs)*
- #name: &mut #name
+ #name: &mut #mangled_name
));
}
} else {
@@ -115,9 +116,9 @@ pub fn codegen(
let is_late = expr.is_none();
if is_late {
let expr = if mut_.is_some() {
- quote!(&mut *#name.as_mut_ptr())
+ quote!(&mut *#mangled_name.as_mut_ptr())
} else {
- quote!(&*#name.as_ptr())
+ quote!(&*#mangled_name.as_ptr())
};
values.push(quote!(
@@ -127,7 +128,7 @@ pub fn codegen(
} else {
values.push(quote!(
#(#cfgs)*
- #name: &#mut_ #name
+ #name: &#mut_ #mangled_name
));
}
}
diff --git a/macros/src/codegen/software_tasks.rs b/macros/src/codegen/software_tasks.rs
index 9918dea1..f5757a12 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::{format_ident, quote};
+use quote::quote;
use rtic_syntax::{ast::App, Context};
use crate::{
@@ -22,13 +22,10 @@ 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 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 inputs = &task.inputs;
@@ -93,13 +90,6 @@ 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);
mod_app.push(constructor);
@@ -129,11 +119,6 @@ pub fn codegen(
#(#stmts)*
}
));
- software_tasks_imports.push(quote!(
- #(#cfgs)*
- #[allow(non_snake_case)]
- use super::#name;
- ));
root.push(module::codegen(
Context::SoftwareTask(name),
@@ -144,5 +129,5 @@ pub fn codegen(
));
}
- (mod_app, root, user_tasks, software_tasks_imports)
+ (mod_app, root, user_tasks)
}
diff --git a/macros/src/codegen/util.rs b/macros/src/codegen/util.rs
index f04ccb23..887ee3bd 100644
--- a/macros/src/codegen/util.rs
+++ b/macros/src/codegen/util.rs
@@ -106,6 +106,14 @@ pub fn late_resources_ident(init: &Ident) -> Ident {
)
}
+/// Mangle an ident
+pub fn mangle_ident(ident: &Ident) -> Ident {
+ Ident::new(
+ &format!("__rtic_internal_{}", ident.to_string()),
+ Span::call_site(),
+ )
+}
+
fn link_section_index() -> usize {
static INDEX: AtomicUsize = AtomicUsize::new(0);
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-28 14:29:14 +0000