aboutsummaryrefslogtreecommitdiff
path: root/macros/src/codegen/init.rs
diff options
context:
space:
mode:
authorGravatar Henrik Tjäder <henrik@tjaders.com> 2020-08-27 11:21:56 +0000
committerGravatar Henrik Tjäder <henrik@tjaders.com> 2020-09-01 14:50:06 +0000
commit76cf14c520091d00985f845203580e14c611ed14 (patch)
tree786278fef57314138f4a50eb59be0dac8a9deb5f /macros/src/codegen/init.rs
parentc5e6d1fa49e3596227a8ee8fe89e2e4f66db3169 (diff)
downloadrtic-76cf14c520091d00985f845203580e14c611ed14.tar.gz
rtic-76cf14c520091d00985f845203580e14c611ed14.tar.zst
rtic-76cf14c520091d00985f845203580e14c611ed14.zip
Brutally yank out multicore
Diffstat (limited to 'macros/src/codegen/init.rs')
-rw-r--r--macros/src/codegen/init.rs23
1 files changed, 10 insertions, 13 deletions
diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs
index fa273fee..4ae9fa62 100644
--- a/macros/src/codegen/init.rs
+++ b/macros/src/codegen/init.rs
@@ -10,7 +10,6 @@ use crate::{
/// Generates support code for `#[init]` functions
pub fn codegen(
- core: u8,
app: &App,
analysis: &Analysis,
extra: &Extra,
@@ -28,8 +27,9 @@ pub fn codegen(
// call_init -- the call to the user `#[init]` if there's one
Option<TokenStream2>,
) {
- if let Some(init) = app.inits.get(&core) {
- let cfg_core = util::cfg_core(core, app.args.cores);
+ //if let Some(init) = app.inits.get(&core) {
+ if app.inits.len() > 0 {
+ let init = &app.inits[0];
let mut needs_lt = false;
let name = &init.name;
@@ -38,8 +38,8 @@ pub fn codegen(
let ret = {
let late_fields = analysis
.late_resources
- .get(&core)
- .map(|resources| {
+ .iter()
+ .flat_map(|resources| {
resources
.iter()
.map(|name| {
@@ -51,16 +51,14 @@ pub fn codegen(
pub #name: #ty
)
})
- .collect::<Vec<_>>()
})
- .unwrap_or(vec![]);
+ .collect::<Vec<_>>();
if !late_fields.is_empty() {
let late_resources = util::late_resources_ident(&name);
root_init.push(quote!(
/// Resources initialized at runtime
- #cfg_core
#[allow(non_snake_case)]
pub struct #late_resources {
#(#late_fields),*
@@ -76,7 +74,7 @@ pub fn codegen(
let mut locals_pat = None;
let mut locals_new = None;
if !init.locals.is_empty() {
- let (struct_, pat) = locals::codegen(Context::Init(core), &init.locals, core, app);
+ let (struct_, pat) = locals::codegen(Context::Init, &init.locals, app);
locals_new = Some(quote!(#name::Locals::new()));
locals_pat = Some(pat);
@@ -86,11 +84,10 @@ pub fn codegen(
let context = &init.context;
let attrs = &init.attrs;
let stmts = &init.stmts;
- let section = util::link_section("text", core);
+ let section = util::link_section("text");
let locals_pat = locals_pat.iter();
let user_init = Some(quote!(
#(#attrs)*
- #cfg_core
#[allow(non_snake_case)]
#section
fn #name(#(#locals_pat,)* #context: #name::Context) #ret {
@@ -101,7 +98,7 @@ pub fn codegen(
let mut const_app = None;
if !init.args.resources.is_empty() {
let (item, constructor) =
- resources_struct::codegen(Context::Init(core), 0, &mut needs_lt, app, analysis);
+ resources_struct::codegen(Context::Init, 0, &mut needs_lt, app, analysis);
root_init.push(item);
const_app = Some(constructor);
@@ -112,7 +109,7 @@ pub fn codegen(
quote!(let late = crate::#name(#(#locals_new,)* #name::Context::new(core.into()));),
);
- root_init.push(module::codegen(Context::Init(core), needs_lt, app, extra));
+ root_init.push(module::codegen(Context::Init, needs_lt, app, extra));
(const_app, root_init, user_init, call_init)
} else {