luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-10-06 10:03:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix --binary with .cpp PLI filenames under relative directory paths.

Browse Source
This commit is contained in:
Wilson Snyder
2024-09-22 16:47:15 -04:00
parent b17619296a
commit d288488b7f
8 changed files with 145 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/V3Os.cpp
+63
View File
@@ -253,6 +253,55 @@ string V3Os::filenameRealPath(const string& filename) VL_PURE {
}
}
string V3Os::filenameRelativePath(const string& filename, const string& base) VL_PURE {
const string a = V3Os::filenameRealPath(filename);
const string b = V3Os::filenameRealPath(base);
string result;
if (a == b) return ".";
auto aIt = a.begin();
auto bIt = b.begin();
while (aIt != a.end() && bIt != b.end()) {
// UINFO(9, "fnrp scan " << (aIt - a.begin()) << " " << a.substr(aIt - a.begin()) << endl);
// UINFO(9, "fnrp scan " << (bIt - b.begin()) << " " << b.substr(bIt - b.begin()) << endl);
auto aWordIt = aIt; // position of next slash
for (; aWordIt != a.end(); ++aWordIt) {
if (isSlash(*aWordIt)) break;
}
auto bWordIt = bIt; // position of next slash
for (; bWordIt != b.end(); ++bWordIt) {
if (isSlash(*bWordIt)) break;
}
const string aWord = a.substr(aIt - a.begin(), aWordIt - aIt);
const string bWord = b.substr(bIt - b.begin(), bWordIt - bIt);
if (aWord != bWord) break;
aIt = aWordIt;
bIt = bWordIt;
if (aIt != a.end()) ++aIt; // Skip slash
if (bIt != b.end()) ++bIt; // Skip slash
}
while (bIt != b.end()) {
for (; bIt != b.end(); ++bIt) {
if (isSlash(*bIt)) {
++bIt;
break;
}
}
if (!result.empty()) result += "/";
result += "..";
}
const string aLeft = a.substr(aIt - a.begin());
if (!aLeft.empty()) {
if (!result.empty()) result += "/";
result += aLeft;
}
return filenameCleanup(result);
}
bool V3Os::filenameIsRel(const string& filename) VL_PURE {
#if defined(_MSC_VER)
return std::filesystem::path(filename).is_relative();
@@ -452,5 +501,19 @@ void V3Os::selfTest() {
UASSERT_SELFTEST(string, filenameExt("a.a/b.b/f"), "");
UASSERT_SELFTEST(string, filenameExt("a.a/b.b/f.e"), ".e");
UASSERT_SELFTEST(string, filenameNonDirExt("a.a/b.b/f.e"), "f");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b", "/a/b"), ".");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b", "/a/b/c"), "..");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b", "/a/b/c/d"), "../..");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b/x", "/a/b/c/d"), "../../x");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b/x/y", "/"), "a/b/x/y");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b/x/y", "/a/b"), "x/y");
UASSERT_SELFTEST(string, filenameRelativePath("/a/b/x/y", "/a/q"), "../b/x/y");
UASSERT_SELFTEST(string, filenameRelativePath("a/b", "a/b"), ".");
UASSERT_SELFTEST(string, filenameRelativePath("a/b", "a/b/c"), "..");
UASSERT_SELFTEST(string, filenameRelativePath("a/b", "a/b/c/d"), "../..");
UASSERT_SELFTEST(string, filenameRelativePath("a/b/x", "a/b/c/d"), "../../x");
UASSERT_SELFTEST(string, filenameRelativePath("a/b/x/y", ""), "a/b/x/y");
UASSERT_SELFTEST(string, filenameRelativePath("a/b/x/y", "a/b"), "x/y");
UASSERT_SELFTEST(string, filenameRelativePath("a/b/x/y", "a/q"), "../b/x/y");
#endif
}