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

Apply 'make format'

This commit is contained in:
github action 2025-04-01 11:34:45 +00:00
parent 559d990e82
commit e3c1d36e6e
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/V3PreProc.cpp
View File

@ -319,9 +319,7 @@ bool V3PreProcImp::defExists(const string& name) {
}
bool V3PreProcImp::defCmdline(const string& name) {
const auto iter = m_defines.find(name);
if (iter == m_defines.end()) {
return false;
}
if (iter == m_defines.end()) { return false; }
return iter->second.cmdline();
}
string V3PreProcImp::defValue(const string& name) {
@ -354,32 +352,31 @@ void V3PreProcImp::define(FileLine* fl, const string& name, const string& value,
} else {
if (defExists(name)) {
if (defCmdline(name) && !cmdline) {
fl->v3warn(DEFOVERRIDE, "Overriding define: '"
<< name << "' with value: '" << value
<< "' to existing command line define value: '"
<< defValue(name)
<< (params == "" ? "" : " ") << params << "'\n"
<< fl->warnContextPrimary() << '\n'
<< defFileline(name)->warnOther()
<< "... Location of previous definition, with value: '"
<< defValue(name)
<< (defParams(name).empty() ? "" : " ")
<< defParams(name) << "'\n"
<< defFileline(name)->warnContextSecondary());
fl->v3warn(DEFOVERRIDE,
"Overriding define: '"
<< name << "' with value: '" << value
<< "' to existing command line define value: '" << defValue(name)
<< (params == "" ? "" : " ") << params << "'\n"
<< fl->warnContextPrimary() << '\n'
<< defFileline(name)->warnOther()
<< "... Location of previous definition, with value: '"
<< defValue(name) << (defParams(name).empty() ? "" : " ")
<< defParams(name) << "'\n"
<< defFileline(name)->warnContextSecondary());
return;
} else {
if (!(defValue(name) == value
&& defParams(name) == params)) { // Duplicate defs are OK
fl->v3warn(REDEFMACRO, "Redefining existing define: '"
<< name << "', with different value: '" << value
<< (params == "" ? "" : " ") << params << "'\n"
<< fl->warnContextPrimary() << '\n'
<< defFileline(name)->warnOther()
<< "... Location of previous definition, with value: '"
<< defValue(name)
<< (defParams(name).empty() ? "" : " ")
<< defParams(name) << "'\n"
<< defFileline(name)->warnContextSecondary());
&& defParams(name) == params)) { // Duplicate defs are OK
fl->v3warn(REDEFMACRO,
"Redefining existing define: '"
<< name << "', with different value: '" << value
<< (params == "" ? "" : " ") << params << "'\n"
<< fl->warnContextPrimary() << '\n'
<< defFileline(name)->warnOther()
<< "... Location of previous definition, with value: '"
<< defValue(name) << (defParams(name).empty() ? "" : " ")
<< defParams(name) << "'\n"
<< defFileline(name)->warnContextSecondary());
}
undef(name);
}

4
test_regress/t/t_define_override.py
View File

@ -11,6 +11,8 @@ import vltest_bootstrap
test.scenarios('linter')
test.lint(verilator_flags2=["+define+TEST_MACRO=20 +define+TEST_MACRO=50"], fails=True, expect_filename=test.golden_filename)
test.lint(verilator_flags2=["+define+TEST_MACRO=20 +define+TEST_MACRO=50"],
fails=True,
expect_filename=test.golden_filename)
test.passes()

4
test_regress/t/t_define_override_output.py
View File

@ -12,7 +12,9 @@ import vltest_bootstrap
test.scenarios('vlt')
test.top_filename = "t/t_define_override.v"
test.compile(verilator_flags2=["-Wno-DEFOVERRIDE -Wno-REDEFMACRO +define+TEST_MACRO=20 +define+TEST_MACRO=50"])
test.compile(verilator_flags2=[
"-Wno-DEFOVERRIDE -Wno-REDEFMACRO +define+TEST_MACRO=20 +define+TEST_MACRO=50"
])
test.execute(expect_filename=test.golden_filename)