Merge pull request #205 from japaric/heterogeneous

rtfm-syntax refactor + heterogeneous multi-core support

5 files changed, 128 insertions, 0 deletions

diff --git a/heterogeneous/examples/smallest.rs b/heterogeneous/examples/smallest.rs
new file mode 100644
index 0000000..9b6bb82
--- /dev/null
+++ b/heterogeneous/examples/smallest.rs
@@ -0,0 +1,7 @@
+#![no_main]
+#![no_std]
+
+use panic_halt as _;
+
+#[rtfm::app(cores = 2, device = heterogeneous)]
+const APP: () = {};
diff --git a/heterogeneous/examples/x-init-2.rs b/heterogeneous/examples/x-init-2.rs
new file mode 100644
index 0000000..033753c
--- /dev/null
+++ b/heterogeneous/examples/x-init-2.rs
@@ -0,0 +1,39 @@
+//! [compile-pass] Cross initialization of late resources
+
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use panic_halt as _;
+
+#[rtfm::app(cores = 2, device = heterogeneous)]
+const APP: () = {
+    struct Resources {
+        // owned by core #1 but initialized by core #0
+        x: u32,
+
+        // owned by core #0 but initialized by core #1
+        y: u32,
+    }
+
+    #[init(core = 0, late = [x])]
+    fn a(_: a::Context) -> a::LateResources {
+        a::LateResources { x: 0 }
+    }
+
+    #[idle(core = 0, resources = [y])]
+    fn b(_: b::Context) -> ! {
+        loop {}
+    }
+
+    #[init(core = 1)]
+    fn c(_: c::Context) -> c::LateResources {
+        c::LateResources { y: 0 }
+    }
+
+    #[idle(core = 1, resources = [x])]
+    fn d(_: d::Context) -> ! {
+        loop {}
+    }
+};
diff --git a/heterogeneous/examples/x-init.rs b/heterogeneous/examples/x-init.rs
new file mode 100644
index 0000000..4183713
--- /dev/null
+++ b/heterogeneous/examples/x-init.rs
@@ -0,0 +1,26 @@
+//! [compile-pass] Split initialization of late resources
+
+#![deny(unsafe_code)]
+#![deny(warnings)]
+#![no_main]
+#![no_std]
+
+use panic_halt as _;
+
+#[rtfm::app(cores = 2, device = heterogeneous)]
+const APP: () = {
+    struct Resources {
+        x: u32,
+        y: u32,
+    }
+
+    #[init(core = 0, late = [x])]
+    fn a(_: a::Context) -> a::LateResources {
+        a::LateResources { x: 0 }
+    }
+
+    #[init(core = 1)]
+    fn b(_: b::Context) -> b::LateResources {
+        b::LateResources { y: 0 }
+    }
+};
diff --git a/heterogeneous/examples/x-schedule.rs b/heterogeneous/examples/x-schedule.rs
new file mode 100644
index 0000000..cbfc01f
--- /dev/null
+++ b/heterogeneous/examples/x-schedule.rs
@@ -0,0 +1,36 @@
+#![no_main]
+#![no_std]
+
+use panic_halt as _;
+
+#[rtfm::app(cores = 2, device = heterogeneous, monotonic = heterogeneous::MT)]
+const APP: () = {
+    #[init(core = 0, spawn = [ping])]
+    fn init(c: init::Context) {
+        c.spawn.ping().ok();
+    }
+
+    #[task(core = 0, schedule = [ping])]
+    fn pong(c: pong::Context) {
+        c.schedule.ping(c.scheduled + 1_000_000).ok();
+    }
+
+    #[task(core = 1, schedule = [pong])]
+    fn ping(c: ping::Context) {
+        c.schedule.pong(c.scheduled + 1_000_000).ok();
+    }
+
+    extern "C" {
+        #[core = 0]
+        fn I0();
+
+        #[core = 0]
+        fn I1();
+
+        #[core = 1]
+        fn I0();
+
+        #[core = 1]
+        fn I1();
+    }
+};
diff --git a/heterogeneous/examples/x-spawn.rs b/heterogeneous/examples/x-spawn.rs
new file mode 100644
index 0000000..3fc64f6
--- /dev/null
+++ b/heterogeneous/examples/x-spawn.rs
@@ -0,0 +1,20 @@
+#![no_main]
+#![no_std]
+
+use panic_halt as _;
+
+#[rtfm::app(cores = 2, device = heterogeneous)]
+const APP: () = {
+    #[init(core = 0, spawn = [foo])]
+    fn init(c: init::Context) {
+        c.spawn.foo().ok();
+    }
+
+    #[task(core = 1)]
+    fn foo(_: foo::Context) {}
+
+    extern "C" {
+        #[core = 1]
+        fn I0();
+    }
+};