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/tests/multi.rs  | 59 ++++++++++++++++++++++++++++++++++++++++++++++
 macros/src/tests/single.rs | 35 +++++++++++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 macros/src/tests/multi.rs
 create mode 100644 macros/src/tests/single.rs

(limited to 'macros/src/tests')

diff --git a/macros/src/tests/multi.rs b/macros/src/tests/multi.rs
new file mode 100644
index 0000000..37fef53
--- /dev/null
+++ b/macros/src/tests/multi.rs
@@ -0,0 +1,59 @@
+use quote::quote;
+use rtfm_syntax::Settings;
+
+#[test]
+fn analyze() {
+    let (app, analysis) = rtfm_syntax::parse2(
+        quote!(device = pac, cores = 2),
+        quote!(
+            const APP: () = {
+                #[task(core = 0, priority = 1)]
+                fn a(_: a::Context) {}
+
+                #[task(core = 0, priority = 2)]
+                fn b(_: b::Context) {}
+
+                #[task(core = 1, priority = 1)]
+                fn c(_: c::Context) {}
+
+                #[task(core = 1, priority = 2)]
+                fn d(_: d::Context) {}
+
+                // first interrupt is assigned to the highest priority dispatcher
+                extern "C" {
+                    #[core = 0]
+                    fn B();
+
+                    #[core = 0]
+                    fn A();
+
+                    #[core = 1]
+                    fn A();
+
+                    #[core = 1]
+                    fn C();
+                }
+            };
+        ),
+        Settings {
+            parse_cores: true,
+            parse_extern_interrupt: true,
+            ..Settings::default()
+        },
+    )
+        .unwrap();
+
+    let analysis = crate::analyze::app(analysis, &app);
+
+    // first core
+    let interrupts0 = &analysis.interrupts[&0];
+    assert_eq!(interrupts0.len(), 2);
+    assert_eq!(interrupts0[&2].to_string(), "B");
+    assert_eq!(interrupts0[&1].to_string(), "A");
+
+    // second core
+    let interrupts1 = &analysis.interrupts[&1];
+    assert_eq!(interrupts1.len(), 2);
+    assert_eq!(interrupts1[&2].to_string(), "A");
+    assert_eq!(interrupts1[&1].to_string(), "C");
+}
diff --git a/macros/src/tests/single.rs b/macros/src/tests/single.rs
new file mode 100644
index 0000000..fb2d430
--- /dev/null
+++ b/macros/src/tests/single.rs
@@ -0,0 +1,35 @@
+use quote::quote;
+use rtfm_syntax::Settings;
+
+#[test]
+fn analyze() {
+    let (app, analysis) = rtfm_syntax::parse2(
+        quote!(device = pac),
+        quote!(
+            const APP: () = {
+                #[task(priority = 1)]
+                fn a(_: a::Context) {}
+
+                #[task(priority = 2)]
+                fn b(_: b::Context) {}
+
+                // first interrupt is assigned to the highest priority dispatcher
+                extern "C" {
+                    fn B();
+                    fn A();
+                }
+            };
+        ),
+        Settings {
+            parse_extern_interrupt: true,
+            ..Settings::default()
+        },
+    )
+    .unwrap();
+
+    let analysis = crate::analyze::app(analysis, &app);
+    let interrupts = &analysis.interrupts[&0];
+    assert_eq!(interrupts.len(), 2);
+    assert_eq!(interrupts[&2].to_string(), "B");
+    assert_eq!(interrupts[&1].to_string(), "A");
+}
-- 
cgit v1.2.3


From 4e51bb68b976c6bb6a9a989dc560d2a8123a84ca Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Thu, 20 Jun 2019 06:19:59 +0200
Subject: RFC #207

---
 macros/src/tests/multi.rs  | 12 ++++++------
 macros/src/tests/single.rs |  7 +++----
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'macros/src/tests')

diff --git a/macros/src/tests/multi.rs b/macros/src/tests/multi.rs
index 37fef53..b55c451 100644
--- a/macros/src/tests/multi.rs
+++ b/macros/src/tests/multi.rs
@@ -3,6 +3,10 @@ use rtfm_syntax::Settings;
 
 #[test]
 fn analyze() {
+    let mut settings = Settings::default();
+    settings.parse_cores = true;
+    settings.parse_extern_interrupt = true;
+
     let (app, analysis) = rtfm_syntax::parse2(
         quote!(device = pac, cores = 2),
         quote!(
@@ -35,13 +39,9 @@ fn analyze() {
                 }
             };
         ),
-        Settings {
-            parse_cores: true,
-            parse_extern_interrupt: true,
-            ..Settings::default()
-        },
+        settings,
     )
-        .unwrap();
+    .unwrap();
 
     let analysis = crate::analyze::app(analysis, &app);
 
diff --git a/macros/src/tests/single.rs b/macros/src/tests/single.rs
index fb2d430..5d7a8a9 100644
--- a/macros/src/tests/single.rs
+++ b/macros/src/tests/single.rs
@@ -3,6 +3,8 @@ use rtfm_syntax::Settings;
 
 #[test]
 fn analyze() {
+    let mut settings = Settings::default();
+    settings.parse_extern_interrupt = true;
     let (app, analysis) = rtfm_syntax::parse2(
         quote!(device = pac),
         quote!(
@@ -20,10 +22,7 @@ fn analyze() {
                 }
             };
         ),
-        Settings {
-            parse_extern_interrupt: true,
-            ..Settings::default()
-        },
+        settings,
     )
     .unwrap();
 
-- 
cgit v1.2.3