From 9e445b3583c15c7701f3167eaa8dfe4afd541691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= <henrik@tjaders.com>
Date: Sat, 4 Feb 2023 16:47:17 +0100
Subject: Move rtic macros to repo root, tune xtask

---
 rtic-macros/src/check.rs | 70 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 rtic-macros/src/check.rs

(limited to 'rtic-macros/src/check.rs')

diff --git a/rtic-macros/src/check.rs b/rtic-macros/src/check.rs
new file mode 100644
index 0000000..a05c82e
--- /dev/null
+++ b/rtic-macros/src/check.rs
@@ -0,0 +1,70 @@
+use std::collections::HashSet;
+
+use crate::syntax::ast::App;
+use syn::parse;
+
+pub fn app(app: &App) -> parse::Result<()> {
+    // Check that external (device-specific) interrupts are not named after known (Cortex-M)
+    // exceptions
+    for name in app.args.dispatchers.keys() {
+        let name_s = name.to_string();
+
+        match &*name_s {
+            "NonMaskableInt" | "HardFault" | "MemoryManagement" | "BusFault" | "UsageFault"
+            | "SecureFault" | "SVCall" | "DebugMonitor" | "PendSV" | "SysTick" => {
+                return Err(parse::Error::new(
+                    name.span(),
+                    "Cortex-M exceptions can't be used as `extern` interrupts",
+                ));
+            }
+
+            _ => {}
+        }
+    }
+
+    // Check that there are enough external interrupts to dispatch the software tasks and the timer
+    // queue handler
+    let mut first = None;
+    let priorities = app
+        .software_tasks
+        .iter()
+        .map(|(name, task)| {
+            first = Some(name);
+            task.args.priority
+        })
+        .filter(|prio| *prio > 0)
+        .collect::<HashSet<_>>();
+
+    let need = priorities.len();
+    let given = app.args.dispatchers.len();
+    if need > given {
+        let s = {
+            format!(
+                "not enough interrupts to dispatch \
+                    all software tasks (need: {need}; given: {given})"
+            )
+        };
+
+        // If not enough tasks and first still is None, may cause
+        // "custom attribute panicked" due to unwrap on None
+        return Err(parse::Error::new(first.unwrap().span(), s));
+    }
+
+    // Check that all exceptions are valid; only exceptions with configurable priorities are
+    // accepted
+    for (name, task) in &app.hardware_tasks {
+        let name_s = task.args.binds.to_string();
+        match &*name_s {
+            "NonMaskableInt" | "HardFault" => {
+                return Err(parse::Error::new(
+                    name.span(),
+                    "only exceptions with configurable priority can be used as hardware tasks",
+                ));
+            }
+
+            _ => {}
+        }
+    }
+
+    Ok(())
+}
-- 
cgit v1.2.3


From 60f0342b697cdddbab9c0e8c6d772bc7aab9de38 Mon Sep 17 00:00:00 2001
From: Emil Fresk <emil.fresk@gmail.com>
Date: Sat, 11 Feb 2023 08:55:19 +0100
Subject: Break out core specific codegen to bindings

---
 rtic-macros/src/check.rs | 71 +++---------------------------------------------
 1 file changed, 4 insertions(+), 67 deletions(-)

(limited to 'rtic-macros/src/check.rs')

diff --git a/rtic-macros/src/check.rs b/rtic-macros/src/check.rs
index a05c82e..957a9b3 100644
--- a/rtic-macros/src/check.rs
+++ b/rtic-macros/src/check.rs
@@ -1,70 +1,7 @@
-use std::collections::HashSet;
-
-use crate::syntax::ast::App;
+use crate::codegen::bindings::architecture_specific_analysis;
+use crate::syntax::{analyze::Analysis, ast::App};
 use syn::parse;
 
-pub fn app(app: &App) -> parse::Result<()> {
-    // Check that external (device-specific) interrupts are not named after known (Cortex-M)
-    // exceptions
-    for name in app.args.dispatchers.keys() {
-        let name_s = name.to_string();
-
-        match &*name_s {
-            "NonMaskableInt" | "HardFault" | "MemoryManagement" | "BusFault" | "UsageFault"
-            | "SecureFault" | "SVCall" | "DebugMonitor" | "PendSV" | "SysTick" => {
-                return Err(parse::Error::new(
-                    name.span(),
-                    "Cortex-M exceptions can't be used as `extern` interrupts",
-                ));
-            }
-
-            _ => {}
-        }
-    }
-
-    // Check that there are enough external interrupts to dispatch the software tasks and the timer
-    // queue handler
-    let mut first = None;
-    let priorities = app
-        .software_tasks
-        .iter()
-        .map(|(name, task)| {
-            first = Some(name);
-            task.args.priority
-        })
-        .filter(|prio| *prio > 0)
-        .collect::<HashSet<_>>();
-
-    let need = priorities.len();
-    let given = app.args.dispatchers.len();
-    if need > given {
-        let s = {
-            format!(
-                "not enough interrupts to dispatch \
-                    all software tasks (need: {need}; given: {given})"
-            )
-        };
-
-        // If not enough tasks and first still is None, may cause
-        // "custom attribute panicked" due to unwrap on None
-        return Err(parse::Error::new(first.unwrap().span(), s));
-    }
-
-    // Check that all exceptions are valid; only exceptions with configurable priorities are
-    // accepted
-    for (name, task) in &app.hardware_tasks {
-        let name_s = task.args.binds.to_string();
-        match &*name_s {
-            "NonMaskableInt" | "HardFault" => {
-                return Err(parse::Error::new(
-                    name.span(),
-                    "only exceptions with configurable priority can be used as hardware tasks",
-                ));
-            }
-
-            _ => {}
-        }
-    }
-
-    Ok(())
+pub fn app(app: &App, analysis: &Analysis) -> parse::Result<()> {
+    architecture_specific_analysis(app, analysis)
 }
-- 
cgit v1.2.3