Fix for non-standard latches (parallaxsw#151)

* latch_3port * Smallfixes * Review amendments * Smallfix * Add comments to describe cases
Silimate · Dec 19, 2024 · adfafa9 · adfafa9
1 parent ec00954
commit adfafa9
Show file tree

Hide file tree

Showing 5 changed files with 715 additions and 9 deletions.
diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc
@@ -3959,21 +3959,29 @@ LibertyReader::seqPortNames(LibertyGroup *group,
 			    bool &has_size,
 			    int &size)
 {
-  int i = 0;
   out_name = nullptr;
   out_inv_name = nullptr;
   size = 1;
   has_size = false;
-  for (LibertyAttrValue *value : *group->params()) {
-    if (i == 0)
-      out_name = value->stringValue();
-    else if (i == 1)
-      out_inv_name = value->stringValue();
-    else if (i == 2) {
-      size = static_cast<int>(value->floatValue());
+  if (group->params()->size() == 2) {
+    // out_port, out_port_inv
+    out_name = group->firstName();
+    out_inv_name = group->secondName();
+  }
+  else if (group->params()->size() == 3) {
+    LibertyAttrValue *third_value = (*group->params())[2];
+    if (third_value->isFloat()) {
+      // out_port, out_port_inv, bus_size
+      out_name = group->firstName();
+      out_inv_name = group->secondName();
+      size = static_cast<int>(third_value->floatValue());
       has_size = true;
     }
-    i++;
+    else {
+      // in_port (ignored), out_port, out_port_inv
+      out_name = group->secondName();
+      out_inv_name = third_value->stringValue();
+    }
   }
 }