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

Return vpiModule when it is the scope.

Browse Source 
Return the vpiModule when it is searched for by name and not the vpiScope,
now that we actually have it (one step further to supporting vpiModule in
complete).

Signed-off-by: Stefan Wallentowitz <stefan@wallentowitz.de>
Signed-off-by: Wilson Snyder <wsnyder@wsnyder.org>
This commit is contained in:
Stefan Wallentowitz 2019-10-02 18:47:12 -04:00 committed by Wilson Snyder
parent 99db18b6c3
commit 633131b984
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/verilated.h
View File

@ -333,7 +333,7 @@ public: // But internals only - called from VerilatedModule's
return scopep->exportFindError(funcnum); // LCOV_EXCL_LINE return scopep->exportFindError(funcnum); // LCOV_EXCL_LINE
} }
} }
Type type() { return m_type; } Type type() const { return m_type; }
}; };
class VerilatedHierarchy { class VerilatedHierarchy {

21
include/verilated_vpi.cpp
View File

@ -164,6 +164,7 @@ public:
}; };
class VerilatedVpioScope : public VerilatedVpio { class VerilatedVpioScope : public VerilatedVpio {
protected:
const VerilatedScope* m_scopep; const VerilatedScope* m_scopep;
public: public:
explicit VerilatedVpioScope(const VerilatedScope* scopep) explicit VerilatedVpioScope(const VerilatedScope* scopep)
@ -310,21 +311,19 @@ public:
} }
}; };
class VerilatedVpioModule : public VerilatedVpio { class VerilatedVpioModule : public VerilatedVpioScope {
const VerilatedScope* m_modulep;
const char* m_name; const char* m_name;
const char* m_fullname; const char* m_fullname;
public: public:
explicit VerilatedVpioModule(const VerilatedScope* modulep) explicit VerilatedVpioModule(const VerilatedScope* modulep)
: m_modulep(modulep) { : VerilatedVpioScope(modulep) {
m_fullname = m_modulep->name(); m_fullname = m_scopep->name();
if (strncmp(m_fullname, "TOP.", 4) == 0) m_fullname += 4; if (strncmp(m_fullname, "TOP.", 4) == 0) m_fullname += 4;
m_name = m_modulep->identifier(); m_name = m_scopep->identifier();
} }
static inline VerilatedVpioModule* castp(vpiHandle h) { static inline VerilatedVpioModule* castp(vpiHandle h) {
return dynamic_cast<VerilatedVpioModule*>((VerilatedVpio*)h); } return dynamic_cast<VerilatedVpioModule*>((VerilatedVpio*)h); }
virtual vluint32_t type() const { return vpiModule; } virtual vluint32_t type() const { return vpiModule; }
const VerilatedScope* modulep() const { return m_modulep; }
virtual const char* name() const { return m_name; } virtual const char* name() const { return m_name; }
virtual const char* fullname() const { return m_fullname; } virtual const char* fullname() const { return m_fullname; }
}; };
@ -1040,9 +1039,9 @@ vpiHandle vpi_handle_by_name(PLI_BYTE8* namep, vpiHandle scope) {
_VL_VPI_ERROR_RESET(); _VL_VPI_ERROR_RESET();
if (VL_UNLIKELY(!namep)) return NULL; if (VL_UNLIKELY(!namep)) return NULL;
VL_DEBUG_IF_PLI(VL_DBG_MSGF("- vpi: vpi_handle_by_name %s %p\n", namep, scope);); VL_DEBUG_IF_PLI(VL_DBG_MSGF("- vpi: vpi_handle_by_name %s %p\n", namep, scope););
VerilatedVpioScope* voScopep = VerilatedVpioScope::castp(scope);
const VerilatedVar* varp = NULL; const VerilatedVar* varp = NULL;
const VerilatedScope* scopep; const VerilatedScope* scopep;
VerilatedVpioScope* voScopep = VerilatedVpioScope::castp(scope);
std::string scopeAndName = namep; std::string scopeAndName = namep;
if (voScopep) { if (voScopep) {
scopeAndName = std::string(voScopep->fullname()) + "." + namep; scopeAndName = std::string(voScopep->fullname()) + "." + namep;
@ -1052,7 +1051,11 @@ vpiHandle vpi_handle_by_name(PLI_BYTE8* namep, vpiHandle scope) {
// This doesn't yet follow the hierarchy in the proper way // This doesn't yet follow the hierarchy in the proper way
scopep = Verilated::scopeFind(namep); scopep = Verilated::scopeFind(namep);
if (scopep) { // Whole thing found as a scope if (scopep) { // Whole thing found as a scope
return (new VerilatedVpioScope(scopep))->castVpiHandle(); if (scopep->type() == VerilatedScope::SCOPE_MODULE) {
return (new VerilatedVpioModule(scopep))->castVpiHandle();
} else {
return (new VerilatedVpioScope(scopep))->castVpiHandle();
}
} }
const char* baseNamep = scopeAndName.c_str(); const char* baseNamep = scopeAndName.c_str();
std::string scopename; std::string scopename;
@ -1188,7 +1191,7 @@ vpiHandle vpi_iterate(PLI_INT32 type, vpiHandle object) {
case vpiModule: { case vpiModule: {
VerilatedVpioModule* vop = VerilatedVpioModule::castp(object); VerilatedVpioModule* vop = VerilatedVpioModule::castp(object);
const VerilatedHierarchyMap* map = VerilatedImp::hierarchyMap(); const VerilatedHierarchyMap* map = VerilatedImp::hierarchyMap();
const VerilatedScope *mod = vop ? vop->modulep() : NULL; const VerilatedScope *mod = vop ? vop->scopep() : NULL;
VerilatedHierarchyMap::const_iterator it = map->find((VerilatedScope*) mod); VerilatedHierarchyMap::const_iterator it = map->find((VerilatedScope*) mod);
if (it == map->end()) return 0; if (it == map->end()) return 0;
return ((new VerilatedVpioModuleIter(it->second))->castVpiHandle()); return ((new VerilatedVpioModuleIter(it->second))->castVpiHandle());

2
test_regress/t/t_vpi_var.cpp
View File

@ -236,7 +236,7 @@ int _mon_check_var() {
p = vpi_get_str(vpiFullName, vh2); p = vpi_get_str(vpiFullName, vh2);
CHECK_RESULT_CSTR(p, TestSimulator::top()); CHECK_RESULT_CSTR(p, TestSimulator::top());
p = vpi_get_str(vpiType, vh2); p = vpi_get_str(vpiType, vh2);
CHECK_RESULT_CSTR (p, "*undefined*"); CHECK_RESULT_CSTR (p, "vpiModule");
TestVpiHandle vh3 = vpi_handle_by_name((PLI_BYTE8*)"onebit", vh2); TestVpiHandle vh3 = vpi_handle_by_name((PLI_BYTE8*)"onebit", vh2);
CHECK_RESULT_NZ(vh3); CHECK_RESULT_NZ(vh3);