aboutsummaryrefslogtreecommitdiff
path: root/macros/src/codegen
diff options
context:
space:
mode:
Diffstat (limited to 'macros/src/codegen')
-rw-r--r--macros/src/codegen/init.rs6
-rw-r--r--macros/src/codegen/post_init.rs9
-rw-r--r--macros/src/codegen/resources.rs10
3 files changed, 21 insertions, 4 deletions
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index fc2faa34..534b79b0 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -44,8 +44,12 @@ pub fn codegen(
.iter()
.map(|name| {
let ty = &app.late_resources[name].ty;
+ let cfgs = &app.late_resources[name].cfgs;
- quote!(pub #name: #ty)
+ quote!(
+ #(#cfgs)*
+ pub #name: #ty
+ )
})
.collect::<Vec<_>>()
})
diff --git a/macros/src/codegen/post_init.rs b/macros/src/codegen/post_init.rs
index 19773e45..b816e072 100644
--- a/macros/src/codegen/post_init.rs
+++ b/macros/src/codegen/post_init.rs
@@ -1,11 +1,13 @@
use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
+use rtfm_syntax::ast::App;
use crate::{analyze::Analysis, check::Extra, codegen::util};
/// Generates code that runs after `#[init]` returns
pub fn codegen(
core: u8,
+ app: &App,
analysis: &Analysis,
extra: &Extra,
) -> (Vec<TokenStream2>, Vec<TokenStream2>) {
@@ -16,8 +18,13 @@ pub fn codegen(
if let Some(late_resources) = analysis.late_resources.get(&core) {
for name in late_resources {
// if it's live
+ let cfgs = app.late_resources[name].cfgs.clone();
if analysis.locations.get(name).is_some() {
- stmts.push(quote!(#name.as_mut_ptr().write(late.#name);));
+ // Need to also include the cfgs
+ stmts.push(quote!(
+ #(#cfgs)*
+ #name.as_mut_ptr().write(late.#name);
+ ));
}
}
}
diff --git a/macros/src/codegen/resources.rs b/macros/src/codegen/resources.rs
index 8cb788d1..83bfabd7 100644
--- a/macros/src/codegen/resources.rs
+++ b/macros/src/codegen/resources.rs
@@ -101,9 +101,15 @@ pub fn codegen(
));
let ptr = if expr.is_none() {
- quote!(#name.as_mut_ptr())
+ quote!(
+ #(#cfgs)*
+ #name.as_mut_ptr()
+ )
} else {
- quote!(&mut #name)
+ quote!(
+ #(#cfgs)*
+ &mut #name
+ )
};
const_app.push(util::impl_mutex(