initial draft for multithreaded rp2040

lf-lang · Feb 22, 2024 · ceec1e9 · ceec1e9
1 parent 150cf6a
commit ceec1e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -346,7 +346,8 @@ CodeBuilder generateCMakeCode(
     }
 
     if (!targetConfig.get(SingleThreadedProperty.INSTANCE)
-        && platformOptions.platform() != Platform.ZEPHYR) {
+        && platformOptions.platform() != Platform.ZEPHYR
+        && platformOptions.platform() != Platform.RP2040) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
@@ -504,9 +505,9 @@ private static String setUpMainTargetRp2040(
     code.pr("pico_sdk_init()");
     code.newLine();
     code.pr("add_subdirectory(core)");
-    code.pr("target_link_libraries(core PUBLIC pico_stdlib)");
-    code.pr("target_link_libraries(core PUBLIC pico_multicore)");
-    code.pr("target_link_libraries(core PUBLIC pico_sync)");
+    code.pr("target_link_libraries(reactor-c PUBLIC pico_stdlib)");
+    code.pr("target_link_libraries(reactor-c PUBLIC pico_multicore)");
+    code.pr("target_link_libraries(reactor-c PUBLIC pico_sync)");
     code.newLine();
     code.pr("set(LF_MAIN_TARGET " + executableName + ")");
 

diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -75,10 +75,10 @@ protected PlatformOptions fromString(String string, MessageReporter reporter) {
   @Override
   public void validate(TargetConfig config, MessageReporter reporter) {
     var singleThreaded = config.get(SingleThreadedProperty.INSTANCE);
-    if (!singleThreaded && config.get(PlatformProperty.INSTANCE).platform == Platform.RP2040) {
+    if (!singleThreaded && !config.get(PlatformProperty.INSTANCE).platform.isMultiThreaded()) {
       reporter
           .at(config.lookup(this), Literals.KEY_VALUE_PAIR__VALUE)
-          .error("Platform " + Platform.RP2040 + " does not support threading.");
+          .error("Platform " + config.get(PlatformProperty.INSTANCE).platform + " does not support threading.");
     }
   }
 

diff --git a/core/src/main/java/org/lflang/target/property/type/PlatformType.java b/core/src/main/java/org/lflang/target/property/type/PlatformType.java
@@ -14,7 +14,7 @@ public enum Platform {
     AUTO,
     ARDUINO, // FIXME: not multithreaded
     NRF52("Nrf52", true),
-    RP2040("Rp2040", false),
+    RP2040("Rp2040", true),
     LINUX("Linux", true),
     MAC("Darwin", true),
     ZEPHYR("Zephyr", true),

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
+1 −1		core/CMakeLists.txt
+1 −0		core/platform/CMakeLists.txt
+114 −6		core/platform/lf_rp2040_support.c
+12 −0		include/core/platform/lf_rp2040_support.h