From 81275bfa4f41e2066770087f3a33cad4227eab41 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 13 Jun 2019 23:56:59 +0200
Subject: rtfm-syntax refactor + heterogeneous multi-core support

---
 macros/src/codegen/locals.rs | 94 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 macros/src/codegen/locals.rs

(limited to 'macros/src/codegen/locals.rs')

diff --git a/macros/src/codegen/locals.rs b/macros/src/codegen/locals.rs
new file mode 100644
index 0000000..9663563
--- /dev/null
+++ b/macros/src/codegen/locals.rs
@@ -0,0 +1,94 @@
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use rtfm_syntax::{
+    ast::{App, Local},
+    Context, Map,
+};
+
+use crate::codegen::util;
+
+pub fn codegen(
+    ctxt: Context,
+    locals: &Map<Local>,
+    app: &App,
+) -> (
+    // locals
+    TokenStream2,
+    // pat
+    TokenStream2,
+) {
+    assert!(!locals.is_empty());
+
+    let runs_once = ctxt.runs_once();
+    let ident = util::locals_ident(ctxt, app);
+
+    let mut lt = None;
+    let mut fields = vec![];
+    let mut items = vec![];
+    let mut names = vec![];
+    let mut values = vec![];
+    let mut pats = vec![];
+    let mut has_cfgs = false;
+
+    for (name, local) in locals {
+        let lt = if runs_once {
+            quote!('static)
+        } else {
+            lt = Some(quote!('a));
+            quote!('a)
+        };
+
+        let cfgs = &local.cfgs;
+        has_cfgs |= !cfgs.is_empty();
+
+        let expr = &local.expr;
+        let ty = &local.ty;
+        fields.push(quote!(
+            #(#cfgs)*
+            #name: &#lt mut #ty
+        ));
+        items.push(quote!(
+            #(#cfgs)*
+            static mut #name: #ty = #expr
+        ));
+        values.push(quote!(
+            #(#cfgs)*
+            #name: &mut #name
+        ));
+        names.push(name);
+        pats.push(quote!(
+            #(#cfgs)*
+            #name
+        ));
+    }
+
+    if lt.is_some() && has_cfgs {
+        fields.push(quote!(__marker__: core::marker::PhantomData<&'a mut ()>));
+        values.push(quote!(__marker__: core::marker::PhantomData));
+    }
+
+    let locals = quote!(
+        #[allow(non_snake_case)]
+        #[doc(hidden)]
+        pub struct #ident<#lt> {
+            #(#fields),*
+        }
+
+        impl<#lt> #ident<#lt> {
+            #[inline(always)]
+            unsafe fn new() -> Self {
+                #(#items;)*
+
+                #ident {
+                    #(#values),*
+                }
+            }
+        }
+    );
+
+    let ident = ctxt.ident(app);
+    (
+        locals,
+        quote!(#ident::Locals { #(#pats,)* .. }: #ident::Locals),
+    )
+}
-- 
cgit v1.2.3


From be92041a592f65f38cee8475b61d35e7fcee3694 Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sat, 29 Jun 2019 09:11:42 +0200
Subject: WIP

---
 macros/src/codegen/locals.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'macros/src/codegen/locals.rs')

diff --git a/macros/src/codegen/locals.rs b/macros/src/codegen/locals.rs
index 9663563..799ef7a 100644
--- a/macros/src/codegen/locals.rs
+++ b/macros/src/codegen/locals.rs
@@ -2,7 +2,7 @@ use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 use rtfm_syntax::{
     ast::{App, Local},
-    Context, Map,
+    Context, Core, Map,
 };
 
 use crate::codegen::util;
@@ -10,6 +10,7 @@ use crate::codegen::util;
 pub fn codegen(
     ctxt: Context,
     locals: &Map<Local>,
+    core: Core,
     app: &App,
 ) -> (
     // locals
@@ -41,6 +42,7 @@ pub fn codegen(
         let cfgs = &local.cfgs;
         has_cfgs |= !cfgs.is_empty();
 
+        let section = util::link_section("data", core);
         let expr = &local.expr;
         let ty = &local.ty;
         fields.push(quote!(
@@ -49,6 +51,7 @@ pub fn codegen(
         ));
         items.push(quote!(
             #(#cfgs)*
+            #section
             static mut #name: #ty = #expr
         ));
         values.push(quote!(
-- 
cgit v1.2.3


From fb84029beef9bec3c205583296b181023f2e4b6b Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 11 Jul 2019 12:53:58 +0200
Subject: implement the #[shared] attribute as specified in RFC #211

---
 macros/src/codegen/locals.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'macros/src/codegen/locals.rs')

diff --git a/macros/src/codegen/locals.rs b/macros/src/codegen/locals.rs
index 799ef7a..cbfe05f 100644
--- a/macros/src/codegen/locals.rs
+++ b/macros/src/codegen/locals.rs
@@ -42,7 +42,11 @@ pub fn codegen(
         let cfgs = &local.cfgs;
         has_cfgs |= !cfgs.is_empty();
 
-        let section = util::link_section("data", core);
+        let section = if local.shared && cfg!(feature = "heterogeneous") {
+            Some(quote!(#[rtfm::export::shared]))
+        } else {
+            util::link_section("data", core)
+        };
         let expr = &local.expr;
         let ty = &local.ty;
         fields.push(quote!(
-- 
cgit v1.2.3