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/assertions.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/macros/src/codegen/assertions.rs b/macros/src/codegen/assertions.rs
index 3e0ad61..0f8326c 100644
--- a/macros/src/codegen/assertions.rs
+++ b/macros/src/codegen/assertions.rs
@@ -1,11 +1,11 @@
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
 
-use crate::{analyze::Analysis, check::Extra, codegen::util};
-use rtic_syntax::ast::App;
+use crate::syntax::ast::App;
+use crate::{analyze::Analysis, codegen::util};
 
 /// Generates compile-time assertions that check that types implement the `Send` / `Sync` traits
-pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream2> {
+pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
     let mut stmts = vec![];
 
     for ty in &analysis.send_types {
@@ -21,7 +21,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         stmts.push(quote!(rtic::export::assert_monotonic::<#ty>();));
     }
 
-    let device = &extra.device;
+    let device = &app.args.device;
     let chunks_name = util::priority_mask_chunks_ident();
     let no_basepri_checks: Vec<_> = app
         .hardware_tasks
@@ -29,9 +29,7 @@ pub fn codegen(app: &App, analysis: &Analysis, extra: &Extra) -> Vec<TokenStream
         .filter_map(|(_, task)| {
             if !util::is_exception(&task.args.binds) {
                 let interrupt_name = &task.args.binds;
-                let cfgs = &task.cfgs;
                 Some(quote!(
-                    #(#cfgs)*
                     if (#device::Interrupt::#interrupt_name as usize) >= (#chunks_name * 32) {
                         ::core::panic!("An interrupt out of range is used while in armv6 or armv8m.base");
                     }
-- 
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/assertions.rs | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/macros/src/codegen/assertions.rs b/macros/src/codegen/assertions.rs
index 0f8326c..dd94aa6 100644
--- a/macros/src/codegen/assertions.rs
+++ b/macros/src/codegen/assertions.rs
@@ -16,11 +16,6 @@ pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
         stmts.push(quote!(rtic::export::assert_sync::<#ty>();));
     }
 
-    for (_, monotonic) in &app.monotonics {
-        let ty = &monotonic.ty;
-        stmts.push(quote!(rtic::export::assert_monotonic::<#ty>();));
-    }
-
     let device = &app.args.device;
     let chunks_name = util::priority_mask_chunks_ident();
     let no_basepri_checks: Vec<_> = app
-- 
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/assertions.rs | 53 ----------------------------------------
 1 file changed, 53 deletions(-)
 delete mode 100644 macros/src/codegen/assertions.rs

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

diff --git a/macros/src/codegen/assertions.rs b/macros/src/codegen/assertions.rs
deleted file mode 100644
index dd94aa6..0000000
--- a/macros/src/codegen/assertions.rs
+++ /dev/null
@@ -1,53 +0,0 @@
-use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
-
-use crate::syntax::ast::App;
-use crate::{analyze::Analysis, codegen::util};
-
-/// Generates compile-time assertions that check that types implement the `Send` / `Sync` traits
-pub fn codegen(app: &App, analysis: &Analysis) -> Vec<TokenStream2> {
-    let mut stmts = vec![];
-
-    for ty in &analysis.send_types {
-        stmts.push(quote!(rtic::export::assert_send::<#ty>();));
-    }
-
-    for ty in &analysis.sync_types {
-        stmts.push(quote!(rtic::export::assert_sync::<#ty>();));
-    }
-
-    let device = &app.args.device;
-    let chunks_name = util::priority_mask_chunks_ident();
-    let no_basepri_checks: Vec<_> = app
-        .hardware_tasks
-        .iter()
-        .filter_map(|(_, task)| {
-            if !util::is_exception(&task.args.binds) {
-                let interrupt_name = &task.args.binds;
-                Some(quote!(
-                    if (#device::Interrupt::#interrupt_name as usize) >= (#chunks_name * 32) {
-                        ::core::panic!("An interrupt out of range is used while in armv6 or armv8m.base");
-                    }
-                ))
-            } else {
-                None
-            }
-        })
-        .collect();
-
-    let const_check = quote! {
-        const _CONST_CHECK: () = {
-            if !rtic::export::have_basepri() {
-                #(#no_basepri_checks)*
-            } else {
-                // TODO: Add armv7 checks here
-            }
-        };
-
-        let _ = _CONST_CHECK;
-    };
-
-    stmts.push(const_check);
-
-    stmts
-}
-- 
cgit v1.2.3