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

When resolving module names, only use defines if no other choice.

This commit is contained in:
Wilson Snyder 2017-11-22 18:43:48 -05:00
parent f8ad0a0923
commit 57c8590b21
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/V3PreShell.cpp
View File

@ -123,12 +123,15 @@ protected:
bool preprocOpen (FileLine* fl, V3InFilter* filterp, const string& modname, const string& lastpath,
const string& errmsg) { // Error message or "" to suppress
// Returns true if successful
// Allow user to put `defined names on the command line instead of filenames,
// then convert them properly.
string ppmodname = s_preprocp->removeDefines (modname);
// Try a pure name in case user has a bogus `filename they don't expect
string filename = v3Global.opt.filePath (fl, modname, lastpath, errmsg);
if (filename=="") {
// Allow user to put `defined names on the command line instead of filenames,
// then convert them properly.
string ppmodname = s_preprocp->removeDefines (modname);
// Open include or master file
string filename = v3Global.opt.filePath (fl, ppmodname, lastpath, errmsg);
filename = v3Global.opt.filePath (fl, ppmodname, lastpath, errmsg);
}
if (filename=="") return false; // Not found
UINFO(2," Reading "<<filename<<endl);