From 76cf14c520091d00985f845203580e14c611ed14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Thu, 27 Aug 2020 11:21:56 +0000 Subject: Brutally yank out multicore --- macros/src/codegen/init.rs | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'macros/src/codegen/init.rs') diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index fa273fe..4ae9fa6 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, ) { - 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::>() }) - .unwrap_or(vec![]); + .collect::>(); 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 { -- cgit v1.2.3 From f151d5871c559012173356259030c1dd36a442cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 1 Sep 2020 14:39:05 +0000 Subject: Cargo fmt --- macros/src/codegen/init.rs | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'macros/src/codegen/init.rs') diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index 4ae9fa6..01074db 100644 --- a/macros/src/codegen/init.rs +++ b/macros/src/codegen/init.rs @@ -40,17 +40,15 @@ pub fn codegen( .late_resources .iter() .flat_map(|resources| { - resources - .iter() - .map(|name| { - let ty = &app.late_resources[name].ty; - let cfgs = &app.late_resources[name].cfgs; - - quote!( - #(#cfgs)* - pub #name: #ty - ) - }) + resources.iter().map(|name| { + let ty = &app.late_resources[name].ty; + let cfgs = &app.late_resources[name].cfgs; + + quote!( + #(#cfgs)* + pub #name: #ty + ) + }) }) .collect::>(); -- cgit v1.2.3 From d8c9476372e25799224d0225bb12c9a9fe043743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 1 Sep 2020 16:12:42 +0000 Subject: Since there only will be one init/idle use .first().unwrap(), matching rtic-syntax --- macros/src/codegen/init.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'macros/src/codegen/init.rs') diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index 01074db..94f57af 100644 --- a/macros/src/codegen/init.rs +++ b/macros/src/codegen/init.rs @@ -27,9 +27,8 @@ pub fn codegen( // call_init -- the call to the user `#[init]` if there's one Option, ) { - //if let Some(init) = app.inits.get(&core) { if app.inits.len() > 0 { - let init = &app.inits[0]; + let init = &app.inits.first().unwrap(); let mut needs_lt = false; let name = &init.name; -- cgit v1.2.3 From d06cf91acc1126e66002f8884b1e7b7a65a9b24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 1 Sep 2020 17:04:55 +0000 Subject: Remove stale code, fix comment styling --- macros/src/codegen/init.rs | 2 -- 1 file changed, 2 deletions(-) (limited to 'macros/src/codegen/init.rs') diff --git a/macros/src/codegen/init.rs b/macros/src/codegen/init.rs index 94f57af..e0b7d69 100644 --- a/macros/src/codegen/init.rs +++ b/macros/src/codegen/init.rs @@ -81,12 +81,10 @@ pub fn codegen( let context = &init.context; let attrs = &init.attrs; let stmts = &init.stmts; - let section = util::link_section("text"); let locals_pat = locals_pat.iter(); let user_init = Some(quote!( #(#attrs)* #[allow(non_snake_case)] - #section fn #name(#(#locals_pat,)* #context: #name::Context) #ret { #(#stmts)* } -- cgit v1.2.3