Merge pull request #646 from os-fpga/yosys-config-json

Make sure no link using empty string net
os-fpga · May 14, 2024 · 9e3c0ef · 9e3c0ef
2 parents 6072d7b + e01dbed
commit 9e3c0ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(VERSION_MAJOR 0)
 set(VERSION_MINOR 0)
 
 
-set(VERSION_PATCH 316)
+set(VERSION_PATCH 317)
 
 
 project(yosys_verific_rs)

diff --git a/design_edit/src/rs_design_edit.cc b/design_edit/src/rs_design_edit.cc
@@ -276,6 +276,9 @@ struct DesignEditRapidSilicon : public ScriptPass {
                   log_assert(signals.is_array());
                 }
                 for (auto& s : signals) {
+                  if ((std::string)(s) == "") {
+                    continue;
+                  }
                   if (i == 0) {
                     linked += link_instance(instances_array, inst["linked_object"], (std::string)(s), 
                                             inst["direction"], uint32_t(inst["index"]) + 1, true, 
@@ -318,6 +321,9 @@ struct DesignEditRapidSilicon : public ScriptPass {
           if (!iter.value().is_string()) {
             continue;
           }
+          if ((std::string)(iter.key()) == "") {
+            continue;
+          }
           if (std::find(CONNECTING_PORTS.begin(), CONNECTING_PORTS.end(), (std::string)(iter.key())) != 
               CONNECTING_PORTS.end() || 
               (inst["module"] == "PLL" && (std::string)(iter.key()) == "CLK_IN")) {