enum const constant pushing

chipsalliance · Nov 14, 2023 · 74d2f69 · 74d2f69
1 parent 36ec06b
commit 74d2f69
Show file tree

Hide file tree

Showing 20 changed files with 1,435 additions and 3,471 deletions.
diff --git a/src/DesignCompile/UhdmWriter.cpp b/src/DesignCompile/UhdmWriter.cpp
@@ -3273,6 +3273,27 @@ void UhdmWriter::lateBinding(Serializer& s, DesignComponent* mod, scope* m) {
                 }
               }
             }
+            if (m->Typespecs()) {
+              for (auto n : *m->Typespecs()) {
+                if (n->UhdmType() == uhdmenum_typespec) {
+                  enum_typespec* tps = any_cast<enum_typespec*>(n);
+                  if (tps && tps->Enum_consts()) {
+                    for (auto c : *tps->Enum_consts()) {
+                      if (c->VpiName() == name) {
+                        ref->Actual_group(c);
+                        break;
+                      }
+                      if (std::string(std::string(m->VpiName()) +
+                                      std::string("::") + std::string(name)) ==
+                          c->VpiName()) {
+                        ref->Actual_group(c);
+                        break;
+                      }
+                    }
+                  }
+                }
+              }
+            }
           }
         }
         if (ref->Actual_group()) break;
@@ -3611,6 +3632,11 @@ void UhdmWriter::lateBinding(Serializer& s, DesignComponent* mod, scope* m) {
                 ref->Actual_group(c);
                 break;
               }
+              if (std::string(std::string(m->VpiName()) + std::string("::") +
+                              std::string(name)) == c->VpiName()) {
+                ref->Actual_group(c);
+                break;
+              }
             }
           }
         }