Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Revert (#3835) (#3836)

Browse Source
This commit is contained in:
Wilson Snyder 2023-01-03 08:25:30 -05:00
parent 6159a7dd8d
commit e004ea7ae2
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/V3EmitCSyms.cpp
View File

@ -296,10 +296,10 @@ class EmitCSyms final : EmitCBaseVisitor {
const string type const string type
= (nodep->origModName() == "__BEGIN__") ? "SCOPE_OTHER" : "SCOPE_MODULE"; = (nodep->origModName() == "__BEGIN__") ? "SCOPE_OTHER" : "SCOPE_MODULE";
const string name = nodep->scopep()->shortName() + "__DOT__" + nodep->name(); const string name = nodep->scopep()->shortName() + "__DOT__" + nodep->name();
const string name_pretty = AstNode::prettyName(name); const string name_dedot = AstNode::dedotName(name);
const int timeunit = m_modp->timeunit().powerOfTen(); const int timeunit = m_modp->timeunit().powerOfTen();
m_vpiScopeCandidates.insert(std::make_pair( m_vpiScopeCandidates.insert(
name, ScopeData(scopeSymString(name), name_pretty, timeunit, type))); std::make_pair(name, ScopeData(scopeSymString(name), name_dedot, timeunit, type)));
} }
} }
void visit(AstScope* nodep) override { void visit(AstScope* nodep) override {
@ -310,10 +310,10 @@ class EmitCSyms final : EmitCBaseVisitor {
if (v3Global.opt.vpi() && !nodep->isTop()) { if (v3Global.opt.vpi() && !nodep->isTop()) {
const string type = VN_IS(nodep->modp(), Package) ? "SCOPE_OTHER" : "SCOPE_MODULE"; const string type = VN_IS(nodep->modp(), Package) ? "SCOPE_OTHER" : "SCOPE_MODULE";
const string name_pretty = AstNode::prettyName(nodep->shortName()); const string name_dedot = AstNode::dedotName(nodep->shortName());
const int timeunit = m_modp->timeunit().powerOfTen(); const int timeunit = m_modp->timeunit().powerOfTen();
m_vpiScopeCandidates.insert( m_vpiScopeCandidates.insert(
std::make_pair(nodep->name(), ScopeData(scopeSymString(nodep->name()), name_pretty, std::make_pair(nodep->name(), ScopeData(scopeSymString(nodep->name()), name_dedot,
timeunit, type))); timeunit, type)));
} }
} }

6
test_regress/t/t_vpi_var.cpp
View File

@ -605,12 +605,6 @@ int _mon_check_putget_str(p_cb_data cb_data) {
= vpi_handle_by_name((PLI_BYTE8*)"verbose", data[i].scope)); = vpi_handle_by_name((PLI_BYTE8*)"verbose", data[i].scope));
} }
for (int i = 1; i <= 6; i++) {
char buf[32];
snprintf(buf, sizeof(buf), TestSimulator::rooted("subs[%d].subsub"), i);
CHECK_RESULT_NZ(data[i].scope = vpi_handle_by_name((PLI_BYTE8*)buf, NULL));
}
static t_cb_data cb_data; static t_cb_data cb_data;
static s_vpi_value v; static s_vpi_value v;
TestVpiHandle count_h = VPI_HANDLE("count"); TestVpiHandle count_h = VPI_HANDLE("count");

10
test_regress/t/t_vpi_var.v
View File

@ -95,15 +95,7 @@ extern "C" int mon_check();
generate generate
for (i=1; i<=6; i=i+1) begin : arr for (i=1; i<=6; i=i+1) begin : arr
arr #(.LENGTH(i)) arr(); arr #(.LENGTH(i)) arr();
end end endgenerate
endgenerate
genvar k;
generate
for (k=1; k<=6; k=k+1) begin : subs
sub subsub();
end
endgenerate
endmodule : t endmodule : t