Merge pull request #205 from japaric/heterogeneous

rtfm-syntax refactor + heterogeneous multi-core support

2 files changed, 93 insertions, 0 deletions

diff --git a/macros/src/tests/multi.rs b/macros/src/tests/multi.rs
new file mode 100644
index 0000000..b55c451
--- /dev/null
+++ b/macros/src/tests/multi.rs
@@ -0,0 +1,59 @@
+use quote::quote;
+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!(
+            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,
+    )
+    .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..5d7a8a9
--- /dev/null
+++ b/macros/src/tests/single.rs
@@ -0,0 +1,34 @@
+use quote::quote;
+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!(
+            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,
+    )
+    .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");
+}