From 7614b96fe45240dafe91ae549e712b560e2d4c10 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 31 Dec 2022 14:45:13 +0100
Subject: RTIC v2: Initial commit

rtic-syntax is now part of RTIC repository
---
 macros/src/codegen/module.rs | 263 +++++++++++++++++++++++--------------------
 1 file changed, 140 insertions(+), 123 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 8dcdbcf..7ac06c5 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -1,7 +1,7 @@
-use crate::{analyze::Analysis, check::Extra, codegen::util};
+use crate::syntax::{ast::App, Context};
+use crate::{analyze::Analysis, codegen::util};
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use rtic_syntax::{ast::App, Context};
 
 #[allow(clippy::too_many_lines)]
 pub fn codegen(
@@ -10,12 +10,13 @@ pub fn codegen(
     local_resources_tick: bool,
     app: &App,
     analysis: &Analysis,
-    extra: &Extra,
 ) -> TokenStream2 {
     let mut items = vec![];
     let mut module_items = vec![];
     let mut fields = vec![];
     let mut values = vec![];
+    // Used to copy task cfgs to the whole module
+    let mut task_cfgs = vec![];
 
     let name = ctxt.ident(app);
 
@@ -27,8 +28,8 @@ pub fn codegen(
                 pub core: rtic::export::Peripherals
             ));
 
-            if extra.peripherals {
-                let device = &extra.device;
+            if app.args.peripherals {
+                let device = &app.args.device;
 
                 fields.push(quote!(
                     /// Device peripherals
@@ -52,14 +53,6 @@ pub fn codegen(
         Context::Idle | Context::HardwareTask(_) | Context::SoftwareTask(_) => {}
     }
 
-    // if ctxt.has_locals(app) {
-    //     let ident = util::locals_ident(ctxt, app);
-    //     module_items.push(quote!(
-    //         #[doc(inline)]
-    //         pub use super::#ident as Locals;
-    //     ));
-    // }
-
     if ctxt.has_local_resources(app) {
         let ident = util::local_resources_ident(ctxt, app);
         let lt = if local_resources_tick {
@@ -114,12 +107,8 @@ pub fn codegen(
             .monotonics
             .iter()
             .map(|(_, monotonic)| {
-                let cfgs = &monotonic.cfgs;
                 let mono = &monotonic.ty;
-                quote! {
-                    #(#cfgs)*
-                    pub #mono
-                }
+                quote! {#mono}
             })
             .collect();
 
@@ -130,7 +119,7 @@ pub fn codegen(
             #[allow(non_snake_case)]
             #[allow(non_camel_case_types)]
             pub struct #internal_monotonics_ident(
-                #(#monotonic_types),*
+                #(pub #monotonic_types),*
             );
         ));
 
@@ -141,10 +130,10 @@ pub fn codegen(
     }
 
     let doc = match ctxt {
-        Context::Idle => " Idle loop",
-        Context::Init => " Initialization function",
-        Context::HardwareTask(_) => " Hardware task",
-        Context::SoftwareTask(_) => " Software task",
+        Context::Idle => "Idle loop",
+        Context::Init => "Initialization function",
+        Context::HardwareTask(_) => "Hardware task",
+        Context::SoftwareTask(_) => "Software task",
     };
 
     let v = Vec::new();
@@ -175,8 +164,8 @@ pub fn codegen(
     let internal_context_name = util::internal_task_ident(name, "Context");
 
     items.push(quote!(
-        /// Execution context
         #(#cfgs)*
+        /// Execution context
         #[allow(non_snake_case)]
         #[allow(non_camel_case_types)]
         pub struct #internal_context_name<#lt> {
@@ -185,7 +174,6 @@ pub fn codegen(
 
         #(#cfgs)*
         impl<#lt> #internal_context_name<#lt> {
-            #[doc(hidden)]
             #[inline(always)]
             pub unsafe fn new(#core #priority) -> Self {
                 #internal_context_name {
@@ -196,8 +184,8 @@ pub fn codegen(
     ));
 
     module_items.push(quote!(
-        #[doc(inline)]
         #(#cfgs)*
+        #[doc(inline)]
         pub use super::#internal_context_name as Context;
     ));
 
@@ -206,6 +194,8 @@ pub fn codegen(
         let priority = spawnee.args.priority;
         let t = util::spawn_t_ident(priority);
         let cfgs = &spawnee.cfgs;
+        // Store a copy of the task cfgs
+        task_cfgs = cfgs.clone();
         let (args, tupled, untupled, ty) = util::regroup_inputs(&spawnee.inputs);
         let args = &args;
         let tupled = &tupled;
@@ -213,112 +203,141 @@ pub fn codegen(
         let rq = util::rq_ident(priority);
         let inputs = util::inputs_ident(name);
 
-        let device = &extra.device;
+        let device = &app.args.device;
         let enum_ = util::interrupt_ident();
-        let interrupt = &analysis
-            .interrupts
-            .get(&priority)
-            .expect("RTIC-ICE: interrupt identifer not found")
-            .0;
+        let interrupt = if spawnee.is_async {
+            &analysis
+                .interrupts_async
+                .get(&priority)
+                .expect("RTIC-ICE: interrupt identifer not found")
+                .0
+        } else {
+            &analysis
+                .interrupts_normal
+                .get(&priority)
+                .expect("RTIC-ICE: interrupt identifer not found")
+                .0
+        };
 
         let internal_spawn_ident = util::internal_task_ident(name, "spawn");
 
         // Spawn caller
-        items.push(quote!(
+        if spawnee.is_async {
+            let rq = util::rq_async_ident(name);
+            items.push(quote!(
 
-        /// Spawns the task directly
-        #(#cfgs)*
-        pub fn #internal_spawn_ident(#(#args,)*) -> Result<(), #ty> {
-            let input = #tupled;
+            #(#cfgs)*
+            /// Spawns the task directly
+            #[allow(non_snake_case)]
+            #[doc(hidden)]
+            pub fn #internal_spawn_ident(#(#args,)*) -> Result<(), #ty> {
+                let input = #tupled;
 
-            unsafe {
-                if let Some(index) = rtic::export::interrupt::free(|_| (&mut *#fq.get_mut()).dequeue()) {
-                    (&mut *#inputs
-                        .get_mut())
-                        .get_unchecked_mut(usize::from(index))
-                        .as_mut_ptr()
-                        .write(input);
+                unsafe {
+                    let r = rtic::export::interrupt::free(|_| (&mut *#rq.get_mut()).enqueue(input));
 
-                    rtic::export::interrupt::free(|_| {
-                        (&mut *#rq.get_mut()).enqueue_unchecked((#t::#name, index));
-                    });
+                    if r.is_ok() {
+                        rtic::pend(#device::#enum_::#interrupt);
+                    }
 
-                    rtic::pend(#device::#enum_::#interrupt);
+                    r
+                }
+            }));
+        } else {
+            items.push(quote!(
 
-                    Ok(())
-                } else {
-                    Err(input)
+            #(#cfgs)*
+            /// Spawns the task directly
+            #[allow(non_snake_case)]
+            #[doc(hidden)]
+            pub fn #internal_spawn_ident(#(#args,)*) -> Result<(), #ty> {
+                let input = #tupled;
+
+                unsafe {
+                    if let Some(index) = rtic::export::interrupt::free(|_| (&mut *#fq.get_mut()).dequeue()) {
+                        (&mut *#inputs
+                            .get_mut())
+                            .get_unchecked_mut(usize::from(index))
+                            .as_mut_ptr()
+                            .write(input);
+
+                        rtic::export::interrupt::free(|_| {
+                            (&mut *#rq.get_mut()).enqueue_unchecked((#t::#name, index));
+                        });
+                        rtic::pend(#device::#enum_::#interrupt);
+
+                        Ok(())
+                    } else {
+                        Err(input)
+                    }
                 }
-            }
 
-        }));
+            }));
+        }
 
         module_items.push(quote!(
-            #[doc(inline)]
             #(#cfgs)*
+            #[doc(inline)]
             pub use super::#internal_spawn_ident as spawn;
         ));
 
         // Schedule caller
-        for (_, monotonic) in &app.monotonics {
-            let instants = util::monotonic_instants_ident(name, &monotonic.ident);
-            let monotonic_name = monotonic.ident.to_string();
-
-            let tq = util::tq_ident(&monotonic.ident.to_string());
-            let t = util::schedule_t_ident();
-            let m = &monotonic.ident;
-            let cfgs = &monotonic.cfgs;
-            let m_ident = util::monotonic_ident(&monotonic_name);
-            let m_isr = &monotonic.args.binds;
-            let enum_ = util::interrupt_ident();
-            let spawn_handle_string = format!("{}::SpawnHandle", m);
-
-            let (enable_interrupt, pend) = if &*m_isr.to_string() == "SysTick" {
-                (
-                    quote!(core::mem::transmute::<_, rtic::export::SYST>(()).enable_interrupt()),
-                    quote!(rtic::export::SCB::set_pendst()),
-                )
-            } else {
-                let rt_err = util::rt_err_ident();
-                (
-                    quote!(rtic::export::NVIC::unmask(#rt_err::#enum_::#m_isr)),
-                    quote!(rtic::pend(#rt_err::#enum_::#m_isr)),
-                )
-            };
-
-            let tq_marker = &util::timer_queue_marker_ident();
-
-            // For future use
-            // let doc = format!(" RTIC internal: {}:{}", file!(), line!());
-            // items.push(quote!(#[doc = #doc]));
-            let internal_spawn_handle_ident =
-                util::internal_monotonics_ident(name, m, "SpawnHandle");
-            let internal_spawn_at_ident = util::internal_monotonics_ident(name, m, "spawn_at");
-            let internal_spawn_after_ident =
-                util::internal_monotonics_ident(name, m, "spawn_after");
-
-            if monotonic.args.default {
+        if !spawnee.is_async {
+            for (_, monotonic) in &app.monotonics {
+                let instants = util::monotonic_instants_ident(name, &monotonic.ident);
+                let monotonic_name = monotonic.ident.to_string();
+
+                let tq = util::tq_ident(&monotonic.ident.to_string());
+                let t = util::schedule_t_ident();
+                let m = &monotonic.ident;
+                let m_ident = util::monotonic_ident(&monotonic_name);
+                let m_isr = &monotonic.args.binds;
+                let enum_ = util::interrupt_ident();
+                let spawn_handle_string = format!("{}::SpawnHandle", m);
+
+                let (enable_interrupt, pend) = if &*m_isr.to_string() == "SysTick" {
+                    (
+                        quote!(core::mem::transmute::<_, rtic::export::SYST>(()).enable_interrupt()),
+                        quote!(rtic::export::SCB::set_pendst()),
+                    )
+                } else {
+                    let rt_err = util::rt_err_ident();
+                    (
+                        quote!(rtic::export::NVIC::unmask(#rt_err::#enum_::#m_isr)),
+                        quote!(rtic::pend(#rt_err::#enum_::#m_isr)),
+                    )
+                };
+
+                let tq_marker = &util::timer_queue_marker_ident();
+
+                let internal_spawn_handle_ident =
+                    util::internal_monotonics_ident(name, m, "SpawnHandle");
+                let internal_spawn_at_ident = util::internal_monotonics_ident(name, m, "spawn_at");
+                let internal_spawn_after_ident =
+                    util::internal_monotonics_ident(name, m, "spawn_after");
+
+                if monotonic.args.default {
+                    module_items.push(quote!(
+                        #[doc(inline)]
+                        pub use #m::spawn_after;
+                        #[doc(inline)]
+                        pub use #m::spawn_at;
+                        #[doc(inline)]
+                        pub use #m::SpawnHandle;
+                    ));
+                }
                 module_items.push(quote!(
-                    #(#cfgs)*
-                    pub use #m::spawn_after;
-                    #(#cfgs)*
-                    pub use #m::spawn_at;
-                    #(#cfgs)*
-                    pub use #m::SpawnHandle;
+                    pub mod #m {
+                        #[doc(inline)]
+                        pub use super::super::#internal_spawn_after_ident as spawn_after;
+                        #[doc(inline)]
+                        pub use super::super::#internal_spawn_at_ident as spawn_at;
+                        #[doc(inline)]
+                        pub use super::super::#internal_spawn_handle_ident as SpawnHandle;
+                    }
                 ));
-            }
-            module_items.push(quote!(
-                #[doc(hidden)]
-                #(#cfgs)*
-                pub mod #m {
-                    pub use super::super::#internal_spawn_after_ident as spawn_after;
-                    pub use super::super::#internal_spawn_at_ident as spawn_at;
-                    pub use super::super::#internal_spawn_handle_ident as SpawnHandle;
-                }
-            ));
 
-            items.push(quote!(
-                #[doc(hidden)]
+                items.push(quote!(
                 #(#cfgs)*
                 #[allow(non_snake_case)]
                 #[allow(non_camel_case_types)]
@@ -329,7 +348,6 @@ pub fn codegen(
 
                 #(#cfgs)*
                 impl core::fmt::Debug for #internal_spawn_handle_ident {
-                    #[doc(hidden)]
                     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
                         f.debug_struct(#spawn_handle_string).finish()
                     }
@@ -340,7 +358,7 @@ pub fn codegen(
                     pub fn cancel(self) -> Result<#ty, ()> {
                         rtic::export::interrupt::free(|_| unsafe {
                             let tq = &mut *#tq.get_mut();
-                            if let Some((_task, index)) = tq.cancel_marker(self.marker) {
+                            if let Some((_task, index)) = tq.cancel_task_marker(self.marker) {
                                 // Get the message
                                 let msg = (&*#inputs
                                     .get())
@@ -357,9 +375,7 @@ pub fn codegen(
                         })
                     }
 
-                    /// Reschedule after 
                     #[inline]
-                    #(#cfgs)*
                     pub fn reschedule_after(
                         self,
                         duration: <#m as rtic::Monotonic>::Duration
@@ -367,8 +383,6 @@ pub fn codegen(
                         self.reschedule_at(monotonics::#m::now() + duration)
                     }
 
-                    /// Reschedule at 
-                    #(#cfgs)*
                     pub fn reschedule_at(
                         self,
                         instant: <#m as rtic::Monotonic>::Instant
@@ -379,16 +393,17 @@ pub fn codegen(
 
                             let tq = (&mut *#tq.get_mut());
 
-                            tq.update_marker(self.marker, marker, instant, || #pend).map(|_| #name::#m::SpawnHandle { marker })
+                            tq.update_task_marker(self.marker, marker, instant, || #pend).map(|_| #name::#m::SpawnHandle { marker })
                         })
                     }
                 }
 
+
+                #(#cfgs)*
                 /// Spawns the task after a set duration relative to the current time
                 ///
                 /// This will use the time `Instant::new(0)` as baseline if called in `#[init]`,
                 /// so if you use a non-resetable timer use `spawn_at` when in `#[init]`
-                #(#cfgs)*
                 #[allow(non_snake_case)]
                 pub fn #internal_spawn_after_ident(
                     duration: <#m as rtic::Monotonic>::Duration
@@ -424,10 +439,10 @@ pub fn codegen(
 
                             rtic::export::interrupt::free(|_| {
                                 let marker = #tq_marker.get().read();
-                                let nr = rtic::export::NotReady {
-                                    instant,
-                                    index,
+                                let nr = rtic::export::TaskNotReady {
                                     task: #t::#name,
+                                    index,
+                                    instant,
                                     marker,
                                 };
 
@@ -435,7 +450,7 @@ pub fn codegen(
 
                                 let tq = &mut *#tq.get_mut();
 
-                                tq.enqueue_unchecked(
+                                tq.enqueue_task_unchecked(
                                     nr,
                                     || #enable_interrupt,
                                     || #pend,
@@ -449,6 +464,7 @@ pub fn codegen(
                     }
                 }
             ));
+            }
         }
     }
 
@@ -457,8 +473,9 @@ pub fn codegen(
     } else {
         quote!(
             #(#items)*
+
             #[allow(non_snake_case)]
-            #(#cfgs)*
+            #(#task_cfgs)*
             #[doc = #doc]
             pub mod #name {
                 #(#module_items)*
-- 
cgit v1.2.3


From f8352122a301c30db7c7851ebf50ad1608ebdad3 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 3 Jan 2023 15:10:59 +0100
Subject: Min codegen

---
 macros/src/codegen/module.rs | 300 +++----------------------------------------
 1 file changed, 19 insertions(+), 281 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 7ac06c5..eb0cb65 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -102,33 +102,6 @@ pub fn codegen(
         values.push(quote!(shared: #name::SharedResources::new(#priority)));
     }
 
-    if let Context::Init = ctxt {
-        let monotonic_types: Vec<_> = app
-            .monotonics
-            .iter()
-            .map(|(_, monotonic)| {
-                let mono = &monotonic.ty;
-                quote! {#mono}
-            })
-            .collect();
-
-        let internal_monotonics_ident = util::mark_internal_name("Monotonics");
-
-        items.push(quote!(
-            /// Monotonics used by the system
-            #[allow(non_snake_case)]
-            #[allow(non_camel_case_types)]
-            pub struct #internal_monotonics_ident(
-                #(pub #monotonic_types),*
-            );
-        ));
-
-        module_items.push(quote!(
-            #[doc(inline)]
-            pub use super::#internal_monotonics_ident as Monotonics;
-        ));
-    }
-
     let doc = match ctxt {
         Context::Idle => "Idle loop",
         Context::Init => "Initialization function",
@@ -192,280 +165,45 @@ pub fn codegen(
     if let Context::SoftwareTask(..) = ctxt {
         let spawnee = &app.software_tasks[name];
         let priority = spawnee.args.priority;
-        let t = util::spawn_t_ident(priority);
         let cfgs = &spawnee.cfgs;
         // Store a copy of the task cfgs
         task_cfgs = cfgs.clone();
-        let (args, tupled, untupled, ty) = util::regroup_inputs(&spawnee.inputs);
-        let args = &args;
-        let tupled = &tupled;
-        let fq = util::fq_ident(name);
-        let rq = util::rq_ident(priority);
-        let inputs = util::inputs_ident(name);
 
         let device = &app.args.device;
         let enum_ = util::interrupt_ident();
-        let interrupt = if spawnee.is_async {
-            &analysis
-                .interrupts_async
-                .get(&priority)
-                .expect("RTIC-ICE: interrupt identifer not found")
-                .0
-        } else {
-            &analysis
-                .interrupts_normal
-                .get(&priority)
-                .expect("RTIC-ICE: interrupt identifer not found")
-                .0
-        };
+        let interrupt = &analysis
+            .interrupts
+            .get(&priority)
+            .expect("RTIC-ICE: interrupt identifer not found")
+            .0;
 
         let internal_spawn_ident = util::internal_task_ident(name, "spawn");
 
         // Spawn caller
-        if spawnee.is_async {
-            let rq = util::rq_async_ident(name);
-            items.push(quote!(
-
-            #(#cfgs)*
-            /// Spawns the task directly
-            #[allow(non_snake_case)]
-            #[doc(hidden)]
-            pub fn #internal_spawn_ident(#(#args,)*) -> Result<(), #ty> {
-                let input = #tupled;
-
-                unsafe {
-                    let r = rtic::export::interrupt::free(|_| (&mut *#rq.get_mut()).enqueue(input));
+        let rq = util::rq_async_ident(name);
+        items.push(quote!(
 
-                    if r.is_ok() {
-                        rtic::pend(#device::#enum_::#interrupt);
-                    }
+        #(#cfgs)*
+        /// Spawns the task directly
+        #[allow(non_snake_case)]
+        #[doc(hidden)]
+        pub fn #internal_spawn_ident() -> Result<(), ()> {
+            unsafe {
+                let r = rtic::export::interrupt::free(|_| (&mut *#rq.get_mut()).enqueue(()));
 
-                    r
+                if r.is_ok() {
+                    rtic::pend(#device::#enum_::#interrupt);
                 }
-            }));
-        } else {
-            items.push(quote!(
 
-            #(#cfgs)*
-            /// Spawns the task directly
-            #[allow(non_snake_case)]
-            #[doc(hidden)]
-            pub fn #internal_spawn_ident(#(#args,)*) -> Result<(), #ty> {
-                let input = #tupled;
-
-                unsafe {
-                    if let Some(index) = rtic::export::interrupt::free(|_| (&mut *#fq.get_mut()).dequeue()) {
-                        (&mut *#inputs
-                            .get_mut())
-                            .get_unchecked_mut(usize::from(index))
-                            .as_mut_ptr()
-                            .write(input);
-
-                        rtic::export::interrupt::free(|_| {
-                            (&mut *#rq.get_mut()).enqueue_unchecked((#t::#name, index));
-                        });
-                        rtic::pend(#device::#enum_::#interrupt);
-
-                        Ok(())
-                    } else {
-                        Err(input)
-                    }
-                }
-
-            }));
-        }
+                r
+            }
+        }));
 
         module_items.push(quote!(
             #(#cfgs)*
             #[doc(inline)]
             pub use super::#internal_spawn_ident as spawn;
         ));
-
-        // Schedule caller
-        if !spawnee.is_async {
-            for (_, monotonic) in &app.monotonics {
-                let instants = util::monotonic_instants_ident(name, &monotonic.ident);
-                let monotonic_name = monotonic.ident.to_string();
-
-                let tq = util::tq_ident(&monotonic.ident.to_string());
-                let t = util::schedule_t_ident();
-                let m = &monotonic.ident;
-                let m_ident = util::monotonic_ident(&monotonic_name);
-                let m_isr = &monotonic.args.binds;
-                let enum_ = util::interrupt_ident();
-                let spawn_handle_string = format!("{}::SpawnHandle", m);
-
-                let (enable_interrupt, pend) = if &*m_isr.to_string() == "SysTick" {
-                    (
-                        quote!(core::mem::transmute::<_, rtic::export::SYST>(()).enable_interrupt()),
-                        quote!(rtic::export::SCB::set_pendst()),
-                    )
-                } else {
-                    let rt_err = util::rt_err_ident();
-                    (
-                        quote!(rtic::export::NVIC::unmask(#rt_err::#enum_::#m_isr)),
-                        quote!(rtic::pend(#rt_err::#enum_::#m_isr)),
-                    )
-                };
-
-                let tq_marker = &util::timer_queue_marker_ident();
-
-                let internal_spawn_handle_ident =
-                    util::internal_monotonics_ident(name, m, "SpawnHandle");
-                let internal_spawn_at_ident = util::internal_monotonics_ident(name, m, "spawn_at");
-                let internal_spawn_after_ident =
-                    util::internal_monotonics_ident(name, m, "spawn_after");
-
-                if monotonic.args.default {
-                    module_items.push(quote!(
-                        #[doc(inline)]
-                        pub use #m::spawn_after;
-                        #[doc(inline)]
-                        pub use #m::spawn_at;
-                        #[doc(inline)]
-                        pub use #m::SpawnHandle;
-                    ));
-                }
-                module_items.push(quote!(
-                    pub mod #m {
-                        #[doc(inline)]
-                        pub use super::super::#internal_spawn_after_ident as spawn_after;
-                        #[doc(inline)]
-                        pub use super::super::#internal_spawn_at_ident as spawn_at;
-                        #[doc(inline)]
-                        pub use super::super::#internal_spawn_handle_ident as SpawnHandle;
-                    }
-                ));
-
-                items.push(quote!(
-                #(#cfgs)*
-                #[allow(non_snake_case)]
-                #[allow(non_camel_case_types)]
-                pub struct #internal_spawn_handle_ident {
-                    #[doc(hidden)]
-                    marker: u32,
-                }
-
-                #(#cfgs)*
-                impl core::fmt::Debug for #internal_spawn_handle_ident {
-                    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
-                        f.debug_struct(#spawn_handle_string).finish()
-                    }
-                }
-
-                #(#cfgs)*
-                impl #internal_spawn_handle_ident {
-                    pub fn cancel(self) -> Result<#ty, ()> {
-                        rtic::export::interrupt::free(|_| unsafe {
-                            let tq = &mut *#tq.get_mut();
-                            if let Some((_task, index)) = tq.cancel_task_marker(self.marker) {
-                                // Get the message
-                                let msg = (&*#inputs
-                                    .get())
-                                    .get_unchecked(usize::from(index))
-                                    .as_ptr()
-                                    .read();
-                                // Return the index to the free queue
-                                (&mut *#fq.get_mut()).split().0.enqueue_unchecked(index);
-
-                                Ok(msg)
-                            } else {
-                                Err(())
-                            }
-                        })
-                    }
-
-                    #[inline]
-                    pub fn reschedule_after(
-                        self,
-                        duration: <#m as rtic::Monotonic>::Duration
-                    ) -> Result<Self, ()> {
-                        self.reschedule_at(monotonics::#m::now() + duration)
-                    }
-
-                    pub fn reschedule_at(
-                        self,
-                        instant: <#m as rtic::Monotonic>::Instant
-                    ) -> Result<Self, ()> {
-                        rtic::export::interrupt::free(|_| unsafe {
-                            let marker = #tq_marker.get().read();
-                            #tq_marker.get_mut().write(marker.wrapping_add(1));
-
-                            let tq = (&mut *#tq.get_mut());
-
-                            tq.update_task_marker(self.marker, marker, instant, || #pend).map(|_| #name::#m::SpawnHandle { marker })
-                        })
-                    }
-                }
-
-
-                #(#cfgs)*
-                /// Spawns the task after a set duration relative to the current time
-                ///
-                /// This will use the time `Instant::new(0)` as baseline if called in `#[init]`,
-                /// so if you use a non-resetable timer use `spawn_at` when in `#[init]`
-                #[allow(non_snake_case)]
-                pub fn #internal_spawn_after_ident(
-                    duration: <#m as rtic::Monotonic>::Duration
-                    #(,#args)*
-                ) -> Result<#name::#m::SpawnHandle, #ty>
-                {
-                    let instant = monotonics::#m::now();
-
-                    #internal_spawn_at_ident(instant + duration #(,#untupled)*)
-                }
-
-                #(#cfgs)*
-                /// Spawns the task at a fixed time instant
-                #[allow(non_snake_case)]
-                pub fn #internal_spawn_at_ident(
-                    instant: <#m as rtic::Monotonic>::Instant
-                    #(,#args)*
-                ) -> Result<#name::#m::SpawnHandle, #ty> {
-                    unsafe {
-                        let input = #tupled;
-                        if let Some(index) = rtic::export::interrupt::free(|_| (&mut *#fq.get_mut()).dequeue()) {
-                            (&mut *#inputs
-                                .get_mut())
-                                .get_unchecked_mut(usize::from(index))
-                                .as_mut_ptr()
-                                .write(input);
-
-                            (&mut *#instants
-                                .get_mut())
-                                .get_unchecked_mut(usize::from(index))
-                                .as_mut_ptr()
-                                .write(instant);
-
-                            rtic::export::interrupt::free(|_| {
-                                let marker = #tq_marker.get().read();
-                                let nr = rtic::export::TaskNotReady {
-                                    task: #t::#name,
-                                    index,
-                                    instant,
-                                    marker,
-                                };
-
-                                #tq_marker.get_mut().write(#tq_marker.get().read().wrapping_add(1));
-
-                                let tq = &mut *#tq.get_mut();
-
-                                tq.enqueue_task_unchecked(
-                                    nr,
-                                    || #enable_interrupt,
-                                    || #pend,
-                                    (&mut *#m_ident.get_mut()).as_mut());
-
-                                Ok(#name::#m::SpawnHandle { marker })
-                            })
-                        } else {
-                            Err(input)
-                        }
-                    }
-                }
-            ));
-            }
-        }
     }
 
     if items.is_empty() {
-- 
cgit v1.2.3


From 5c3cedf69ad07cb8522a0b040bdbf1f9ca4cf37b Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Wed, 4 Jan 2023 20:29:16 +0100
Subject: Fix fences

---
 macros/src/codegen/module.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index eb0cb65..b4ad68a 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -111,14 +111,8 @@ pub fn codegen(
 
     let v = Vec::new();
     let cfgs = match ctxt {
-        Context::HardwareTask(t) => {
-            &app.hardware_tasks[t].cfgs
-            // ...
-        }
-        Context::SoftwareTask(t) => {
-            &app.software_tasks[t].cfgs
-            // ...
-        }
+        Context::HardwareTask(t) => &app.hardware_tasks[t].cfgs,
+        Context::SoftwareTask(t) => &app.software_tasks[t].cfgs,
         _ => &v,
     };
 
-- 
cgit v1.2.3


From 3b97531a5c40293e265999db543acec365c629df Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Wed, 4 Jan 2023 21:33:41 +0100
Subject: First example builds again

---
 macros/src/codegen/module.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index b4ad68a..7bbfdf3 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -183,13 +183,14 @@ pub fn codegen(
         #[doc(hidden)]
         pub fn #internal_spawn_ident() -> Result<(), ()> {
             unsafe {
-                let r = rtic::export::interrupt::free(|_| (&mut *#rq.get_mut()).enqueue(()));
-
-                if r.is_ok() {
+                // TODO: Fix this to be compare and swap
+                if #rq.load(core::sync::atomic::Ordering::Acquire) {
+                    Err(())
+                } else {
+                    #rq.store(true, core::sync::atomic::Ordering::Release);
                     rtic::pend(#device::#enum_::#interrupt);
+                    Ok(())
                 }
-
-                r
             }
         }));
 
-- 
cgit v1.2.3


From 714020a624ca93c42d5da7ebe612e7fc668e1471 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 7 Jan 2023 11:24:13 +0100
Subject: Removed Priority, simplified lifetime handling

---
 macros/src/codegen/module.rs | 50 ++++++++++----------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 7bbfdf3..a64abd8 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -4,13 +4,7 @@ use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
 #[allow(clippy::too_many_lines)]
-pub fn codegen(
-    ctxt: Context,
-    shared_resources_tick: bool,
-    local_resources_tick: bool,
-    app: &App,
-    analysis: &Analysis,
-) -> TokenStream2 {
+pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
     let mut items = vec![];
     let mut module_items = vec![];
     let mut fields = vec![];
@@ -20,7 +14,6 @@ pub fn codegen(
 
     let name = ctxt.ident(app);
 
-    let mut lt = None;
     match ctxt {
         Context::Init => {
             fields.push(quote!(
@@ -39,10 +32,9 @@ pub fn codegen(
                 values.push(quote!(device: #device::Peripherals::steal()));
             }
 
-            lt = Some(quote!('a));
             fields.push(quote!(
                 /// Critical section token for init
-                pub cs: rtic::export::CriticalSection<#lt>
+                pub cs: rtic::export::CriticalSection<'a>
             ));
 
             values.push(quote!(cs: rtic::export::CriticalSection::new()));
@@ -55,12 +47,6 @@ pub fn codegen(
 
     if ctxt.has_local_resources(app) {
         let ident = util::local_resources_ident(ctxt, app);
-        let lt = if local_resources_tick {
-            lt = Some(quote!('a));
-            Some(quote!('a))
-        } else {
-            None
-        };
 
         module_items.push(quote!(
             #[doc(inline)]
@@ -69,7 +55,7 @@ pub fn codegen(
 
         fields.push(quote!(
             /// Local Resources this task has access to
-            pub local: #name::LocalResources<#lt>
+            pub local: #name::LocalResources<'a>
         ));
 
         values.push(quote!(local: #name::LocalResources::new()));
@@ -77,12 +63,6 @@ pub fn codegen(
 
     if ctxt.has_shared_resources(app) {
         let ident = util::shared_resources_ident(ctxt, app);
-        let lt = if shared_resources_tick {
-            lt = Some(quote!('a));
-            Some(quote!('a))
-        } else {
-            None
-        };
 
         module_items.push(quote!(
             #[doc(inline)]
@@ -91,15 +71,10 @@ pub fn codegen(
 
         fields.push(quote!(
             /// Shared Resources this task has access to
-            pub shared: #name::SharedResources<#lt>
+            pub shared: #name::SharedResources<'a>
         ));
 
-        let priority = if ctxt.is_init() {
-            None
-        } else {
-            Some(quote!(priority))
-        };
-        values.push(quote!(shared: #name::SharedResources::new(#priority)));
+        values.push(quote!(shared: #name::SharedResources::new()));
     }
 
     let doc = match ctxt {
@@ -122,12 +97,6 @@ pub fn codegen(
         None
     };
 
-    let priority = if ctxt.is_init() {
-        None
-    } else {
-        Some(quote!(priority: &#lt rtic::export::Priority))
-    };
-
     let internal_context_name = util::internal_task_ident(name, "Context");
 
     items.push(quote!(
@@ -135,15 +104,18 @@ pub fn codegen(
         /// Execution context
         #[allow(non_snake_case)]
         #[allow(non_camel_case_types)]
-        pub struct #internal_context_name<#lt> {
+        pub struct #internal_context_name<'a> {
+            #[doc(hidden)]
+            __rtic_internal_p: ::core::marker::PhantomData<&'a ()>,
             #(#fields,)*
         }
 
         #(#cfgs)*
-        impl<#lt> #internal_context_name<#lt> {
+        impl<'a> #internal_context_name<'a> {
             #[inline(always)]
-            pub unsafe fn new(#core #priority) -> Self {
+            pub unsafe fn new(#core) -> Self {
                 #internal_context_name {
+                    __rtic_internal_p: ::core::marker::PhantomData,
                     #(#values,)*
                 }
             }
-- 
cgit v1.2.3


From 9a67f00a30f14df3b9635913f728afd0b40c138d Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 8 Jan 2023 19:16:36 +0100
Subject: Fix typos

---
 macros/src/codegen/module.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index a64abd8..c6f7690 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -140,7 +140,7 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
         let interrupt = &analysis
             .interrupts
             .get(&priority)
-            .expect("RTIC-ICE: interrupt identifer not found")
+            .expect("RTIC-ICE: interrupt identifier not found")
             .0;
 
         let internal_spawn_ident = util::internal_task_ident(name, "spawn");
-- 
cgit v1.2.3


From 6d252785e83218eeb5d080836281c90b86ca0e03 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sun, 8 Jan 2023 21:10:06 +0100
Subject: Support 0 prio tasks

---
 macros/src/codegen/module.rs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index c6f7690..70fbb5e 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -135,13 +135,14 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
         // Store a copy of the task cfgs
         task_cfgs = cfgs.clone();
 
-        let device = &app.args.device;
-        let enum_ = util::interrupt_ident();
-        let interrupt = &analysis
-            .interrupts
-            .get(&priority)
-            .expect("RTIC-ICE: interrupt identifier not found")
-            .0;
+        let pend_interrupt = if priority > 0 {
+            let device = &app.args.device;
+            let enum_ = util::interrupt_ident();
+            let interrupt = &analysis.interrupts.get(&priority).expect("UREACHABLE").0;
+            quote!(rtic::pend(#device::#enum_::#interrupt);)
+        } else {
+            quote!()
+        };
 
         let internal_spawn_ident = util::internal_task_ident(name, "spawn");
 
@@ -160,7 +161,7 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
                     Err(())
                 } else {
                     #rq.store(true, core::sync::atomic::Ordering::Release);
-                    rtic::pend(#device::#enum_::#interrupt);
+                    #pend_interrupt
                     Ok(())
                 }
             }
-- 
cgit v1.2.3


From cd790a94286cdc307d399b7f7a43e305e90de5bf Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Mon, 9 Jan 2023 21:02:53 +0100
Subject: More work on new spawn/executor

---
 macros/src/codegen/module.rs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 70fbb5e..19cf241 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -98,6 +98,7 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
     };
 
     let internal_context_name = util::internal_task_ident(name, "Context");
+    let exec_name = util::internal_task_ident(name, "EXEC");
 
     items.push(quote!(
         #(#cfgs)*
@@ -147,25 +148,25 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
         let internal_spawn_ident = util::internal_task_ident(name, "spawn");
 
         // Spawn caller
-        let rq = util::rq_async_ident(name);
         items.push(quote!(
-
-        #(#cfgs)*
-        /// Spawns the task directly
-        #[allow(non_snake_case)]
-        #[doc(hidden)]
-        pub fn #internal_spawn_ident() -> Result<(), ()> {
-            unsafe {
-                // TODO: Fix this to be compare and swap
-                if #rq.load(core::sync::atomic::Ordering::Acquire) {
-                    Err(())
-                } else {
-                    #rq.store(true, core::sync::atomic::Ordering::Release);
+            #(#cfgs)*
+            /// Spawns the task directly
+            #[allow(non_snake_case)]
+            #[doc(hidden)]
+            pub fn #internal_spawn_ident() -> Result<(), ()> {
+                if #exec_name.try_reserve() {
+                    unsafe {
+                        // TODO: Add args here
+                        #exec_name.spawn_unchecked(#name(#name::Context::new()));
+                    }
                     #pend_interrupt
+
                     Ok(())
+                } else {
+                    Err(())
                 }
             }
-        }));
+        ));
 
         module_items.push(quote!(
             #(#cfgs)*
-- 
cgit v1.2.3


From d6d58b0eb88242cf63724e1420bd29f8a4489916 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Tue, 10 Jan 2023 21:03:10 +0100
Subject: Async tasks can now take arguments at spawn again

---
 macros/src/codegen/module.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 19cf241..666bd04 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -146,6 +146,8 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
         };
 
         let internal_spawn_ident = util::internal_task_ident(name, "spawn");
+        let (input_args, input_tupled, input_untupled, input_ty) =
+            util::regroup_inputs(&spawnee.inputs);
 
         // Spawn caller
         items.push(quote!(
@@ -153,17 +155,18 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
             /// Spawns the task directly
             #[allow(non_snake_case)]
             #[doc(hidden)]
-            pub fn #internal_spawn_ident() -> Result<(), ()> {
+            pub fn #internal_spawn_ident(#(#input_args,)*) -> Result<(), #input_ty> {
                 if #exec_name.try_reserve() {
+                    // This unsafe is protected by `try_reserve`, see its documentation for details
                     unsafe {
-                        // TODO: Add args here
-                        #exec_name.spawn_unchecked(#name(#name::Context::new()));
+                        #exec_name.spawn_unchecked(#name(#name::Context::new() #(,#input_untupled)*));
                     }
+
                     #pend_interrupt
 
                     Ok(())
                 } else {
-                    Err(())
+                    Err(#input_tupled)
                 }
             }
         ));
-- 
cgit v1.2.3


From 5688a5d332cdaffaca64ade5b138a3676ac7cd32 Mon Sep 17 00:00:00 2001
From: Per Lindgren <per.lindgren@ltu.se>
Date: Thu, 12 Jan 2023 08:50:12 +0100
Subject: executor update for less unsafe and more clear

---
 macros/src/codegen/module.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index 666bd04..f4c188a 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -156,11 +156,8 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
             #[allow(non_snake_case)]
             #[doc(hidden)]
             pub fn #internal_spawn_ident(#(#input_args,)*) -> Result<(), #input_ty> {
-                if #exec_name.try_reserve() {
-                    // This unsafe is protected by `try_reserve`, see its documentation for details
-                    unsafe {
-                        #exec_name.spawn_unchecked(#name(#name::Context::new() #(,#input_untupled)*));
-                    }
+
+                if #exec_name.spawn(|| #name(unsafe { #name::Context::new() } #(,#input_untupled)*) ) {
 
                     #pend_interrupt
 
@@ -168,6 +165,7 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
                 } else {
                     Err(#input_tupled)
                 }
+
             }
         ));
 
-- 
cgit v1.2.3


From b8b881f446a226d6f3c4a7db7c9174590b47dbf6 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Thu, 19 Jan 2023 13:56:59 +0100
Subject: Fix so deny(missing_docs) work

---
 macros/src/codegen/module.rs | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
index f4c188a..4725b9a 100644
--- a/macros/src/codegen/module.rs
+++ b/macros/src/codegen/module.rs
@@ -114,6 +114,7 @@ pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
         #(#cfgs)*
         impl<'a> #internal_context_name<'a> {
             #[inline(always)]
+            #[allow(missing_docs)]
             pub unsafe fn new(#core) -> Self {
                 #internal_context_name {
                     __rtic_internal_p: ::core::marker::PhantomData,
-- 
cgit v1.2.3


From 306aa47170fd59369b7a184924e287dc3706d64d Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Mon, 23 Jan 2023 20:05:47 +0100
Subject: Add rtic-timer (timerqueue + monotonic) and rtic-monotonics
 (systick-monotonic)

---
 macros/src/codegen/module.rs | 194 -------------------------------------------
 1 file changed, 194 deletions(-)
 delete mode 100644 macros/src/codegen/module.rs

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

diff --git a/macros/src/codegen/module.rs b/macros/src/codegen/module.rs
deleted file mode 100644
index 4725b9a..0000000
--- a/macros/src/codegen/module.rs
+++ /dev/null
@@ -1,194 +0,0 @@
-use crate::syntax::{ast::App, Context};
-use crate::{analyze::Analysis, codegen::util};
-use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
-
-#[allow(clippy::too_many_lines)]
-pub fn codegen(ctxt: Context, app: &App, analysis: &Analysis) -> TokenStream2 {
-    let mut items = vec![];
-    let mut module_items = vec![];
-    let mut fields = vec![];
-    let mut values = vec![];
-    // Used to copy task cfgs to the whole module
-    let mut task_cfgs = vec![];
-
-    let name = ctxt.ident(app);
-
-    match ctxt {
-        Context::Init => {
-            fields.push(quote!(
-                /// Core (Cortex-M) peripherals
-                pub core: rtic::export::Peripherals
-            ));
-
-            if app.args.peripherals {
-                let device = &app.args.device;
-
-                fields.push(quote!(
-                    /// Device peripherals
-                    pub device: #device::Peripherals
-                ));
-
-                values.push(quote!(device: #device::Peripherals::steal()));
-            }
-
-            fields.push(quote!(
-                /// Critical section token for init
-                pub cs: rtic::export::CriticalSection<'a>
-            ));
-
-            values.push(quote!(cs: rtic::export::CriticalSection::new()));
-
-            values.push(quote!(core));
-        }
-
-        Context::Idle | Context::HardwareTask(_) | Context::SoftwareTask(_) => {}
-    }
-
-    if ctxt.has_local_resources(app) {
-        let ident = util::local_resources_ident(ctxt, app);
-
-        module_items.push(quote!(
-            #[doc(inline)]
-            pub use super::#ident as LocalResources;
-        ));
-
-        fields.push(quote!(
-            /// Local Resources this task has access to
-            pub local: #name::LocalResources<'a>
-        ));
-
-        values.push(quote!(local: #name::LocalResources::new()));
-    }
-
-    if ctxt.has_shared_resources(app) {
-        let ident = util::shared_resources_ident(ctxt, app);
-
-        module_items.push(quote!(
-            #[doc(inline)]
-            pub use super::#ident as SharedResources;
-        ));
-
-        fields.push(quote!(
-            /// Shared Resources this task has access to
-            pub shared: #name::SharedResources<'a>
-        ));
-
-        values.push(quote!(shared: #name::SharedResources::new()));
-    }
-
-    let doc = match ctxt {
-        Context::Idle => "Idle loop",
-        Context::Init => "Initialization function",
-        Context::HardwareTask(_) => "Hardware task",
-        Context::SoftwareTask(_) => "Software task",
-    };
-
-    let v = Vec::new();
-    let cfgs = match ctxt {
-        Context::HardwareTask(t) => &app.hardware_tasks[t].cfgs,
-        Context::SoftwareTask(t) => &app.software_tasks[t].cfgs,
-        _ => &v,
-    };
-
-    let core = if ctxt.is_init() {
-        Some(quote!(core: rtic::export::Peripherals,))
-    } else {
-        None
-    };
-
-    let internal_context_name = util::internal_task_ident(name, "Context");
-    let exec_name = util::internal_task_ident(name, "EXEC");
-
-    items.push(quote!(
-        #(#cfgs)*
-        /// Execution context
-        #[allow(non_snake_case)]
-        #[allow(non_camel_case_types)]
-        pub struct #internal_context_name<'a> {
-            #[doc(hidden)]
-            __rtic_internal_p: ::core::marker::PhantomData<&'a ()>,
-            #(#fields,)*
-        }
-
-        #(#cfgs)*
-        impl<'a> #internal_context_name<'a> {
-            #[inline(always)]
-            #[allow(missing_docs)]
-            pub unsafe fn new(#core) -> Self {
-                #internal_context_name {
-                    __rtic_internal_p: ::core::marker::PhantomData,
-                    #(#values,)*
-                }
-            }
-        }
-    ));
-
-    module_items.push(quote!(
-        #(#cfgs)*
-        #[doc(inline)]
-        pub use super::#internal_context_name as Context;
-    ));
-
-    if let Context::SoftwareTask(..) = ctxt {
-        let spawnee = &app.software_tasks[name];
-        let priority = spawnee.args.priority;
-        let cfgs = &spawnee.cfgs;
-        // Store a copy of the task cfgs
-        task_cfgs = cfgs.clone();
-
-        let pend_interrupt = if priority > 0 {
-            let device = &app.args.device;
-            let enum_ = util::interrupt_ident();
-            let interrupt = &analysis.interrupts.get(&priority).expect("UREACHABLE").0;
-            quote!(rtic::pend(#device::#enum_::#interrupt);)
-        } else {
-            quote!()
-        };
-
-        let internal_spawn_ident = util::internal_task_ident(name, "spawn");
-        let (input_args, input_tupled, input_untupled, input_ty) =
-            util::regroup_inputs(&spawnee.inputs);
-
-        // Spawn caller
-        items.push(quote!(
-            #(#cfgs)*
-            /// Spawns the task directly
-            #[allow(non_snake_case)]
-            #[doc(hidden)]
-            pub fn #internal_spawn_ident(#(#input_args,)*) -> Result<(), #input_ty> {
-
-                if #exec_name.spawn(|| #name(unsafe { #name::Context::new() } #(,#input_untupled)*) ) {
-
-                    #pend_interrupt
-
-                    Ok(())
-                } else {
-                    Err(#input_tupled)
-                }
-
-            }
-        ));
-
-        module_items.push(quote!(
-            #(#cfgs)*
-            #[doc(inline)]
-            pub use super::#internal_spawn_ident as spawn;
-        ));
-    }
-
-    if items.is_empty() {
-        quote!()
-    } else {
-        quote!(
-            #(#items)*
-
-            #[allow(non_snake_case)]
-            #(#task_cfgs)*
-            #[doc = #doc]
-            pub mod #name {
-                #(#module_items)*
-            }
-        )
-    }
-}
-- 
cgit v1.2.3