luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[#73912] fix incorrect nesting of scopes in case of empty top name

This commit is contained in:
Mateusz Gancarz 2025-03-03 15:24:06 +01:00
parent 812fe0ef0c
commit 78e0cd5b34
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/verilated_saif_c.cpp
View File

@ -376,10 +376,14 @@ void VerilatedSaif::printIndent() {
} }
void VerilatedSaif::pushPrefix(const std::string& name, VerilatedTracePrefixType type) { void VerilatedSaif::pushPrefix(const std::string& name, VerilatedTracePrefixType type) {
assert(!m_prefixStack.empty());
std::string pname = name; std::string pname = name;
if (pname.empty()) { pname = "$rootio"; }
if (m_prefixStack.back().second == VerilatedTracePrefixType::ROOTIO_MODULE) popPrefix();
if (pname.empty())
{
pname = "$rootio";
type = VerilatedTracePrefixType::ROOTIO_MODULE;
}
if (type != VerilatedTracePrefixType::ARRAY_UNPACKED if (type != VerilatedTracePrefixType::ARRAY_UNPACKED
&& type != VerilatedTracePrefixType::ARRAY_PACKED) { && type != VerilatedTracePrefixType::ARRAY_PACKED) {
@ -403,10 +407,9 @@ void VerilatedSaif::pushPrefix(const std::string& name, VerilatedTracePrefixType
} }
void VerilatedSaif::popPrefix() { void VerilatedSaif::popPrefix() {
assert(m_prefixStack.size() > 1);
if (m_prefixStack.back().second != VerilatedTracePrefixType::ARRAY_UNPACKED if (m_prefixStack.back().second != VerilatedTracePrefixType::ARRAY_UNPACKED
&& m_prefixStack.back().second != VerilatedTracePrefixType::ARRAY_PACKED) { && m_prefixStack.back().second != VerilatedTracePrefixType::ARRAY_PACKED
&& m_currentScope >= 0) {
m_currentScope = m_scopes.at(m_currentScope).getParentScopeIndex(); m_currentScope = m_scopes.at(m_currentScope).getParentScopeIndex();
} }