diff --git a/Changes b/Changes index f5bc1d388..2af61c435 100644 --- a/Changes +++ b/Changes @@ -13,6 +13,7 @@ Verilator 4.219 devel **Minor:** +* Removed the deprecated lint_off flag -msg; use -rule instead. Verilator 4.218 2022-01-17 diff --git a/docs/guide/deprecations.rst b/docs/guide/deprecations.rst index 0099b8d9d..a012241f4 100644 --- a/docs/guide/deprecations.rst +++ b/docs/guide/deprecations.rst @@ -16,10 +16,6 @@ Verilated_heavy.h "verilated.h". Verilated_heavy.h is planned for removal no sooner than July 2022. -Configuration File -msg - The :vlopt:`lint_off` "-msg" option has been replaced with the "-rule" - option. "-msg" is planned for removal no sooner than January 2021. - XML locations The XML "fl" attribute has been replaced with the "loc" attribute. "fl" is planned for removal no sooner than January 2021. diff --git a/src/verilog.l b/src/verilog.l index 4fa5fc319..588da6073 100644 --- a/src/verilog.l +++ b/src/verilog.l @@ -142,7 +142,6 @@ vnum {vnum1}|{vnum2}|{vnum3}|{vnum4}|{vnum5} -?"-match" { FL; return yVLT_D_MATCH; } -?"-model" { FL; return yVLT_D_MODEL; } -?"-module" { FL; return yVLT_D_MODULE; } - -?"-msg" { FL; return yVLT_D_MSG; } -?"-mtask" { FL; return yVLT_D_MTASK; } -?"-rule" { FL; return yVLT_D_RULE; } -?"-task" { FL; return yVLT_D_TASK; } diff --git a/src/verilog.y b/src/verilog.y index 483c14a69..c5bac151a 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -370,7 +370,6 @@ BISONPRE_VERSION(3.7,%define api.header.include {"V3ParseBison.h"}) %token yVLT_D_MATCH "--match" %token yVLT_D_MODEL "--model" %token yVLT_D_MODULE "--module" -%token yVLT_D_MSG "--msg" %token yVLT_D_MTASK "--mtask" %token yVLT_D_RULE "--rule" %token yVLT_D_TASK "--task" @@ -6436,10 +6435,6 @@ vltOffFront: yVLT_COVERAGE_OFF { $$ = V3ErrorCode::I_COVERAGE; } | yVLT_TRACING_OFF { $$ = V3ErrorCode::I_TRACING; } | yVLT_LINT_OFF { $$ = V3ErrorCode::I_LINT; } - | yVLT_LINT_OFF yVLT_D_MSG idAny - { $$ = V3ErrorCode((*$3).c_str()); - if ($$ == V3ErrorCode::EC_ERROR) { $1->v3error("Unknown Error Code: " << *$3); } - $2->v3warn(DEPRECATED, "Deprecated -msg in configuration files, use -rule instead."); } | yVLT_LINT_OFF yVLT_D_RULE idAny { $$ = V3ErrorCode((*$3).c_str()); if ($$ == V3ErrorCode::EC_ERROR) { $1->v3error("Unknown Error Code: " << *$3); } } @@ -6449,10 +6444,6 @@ vltOnFront: yVLT_COVERAGE_ON { $$ = V3ErrorCode::I_COVERAGE; } | yVLT_TRACING_ON { $$ = V3ErrorCode::I_TRACING; } | yVLT_LINT_ON { $$ = V3ErrorCode::I_LINT; } - | yVLT_LINT_ON yVLT_D_MSG idAny - { $$ = V3ErrorCode((*$3).c_str()); - if ($$ == V3ErrorCode::EC_ERROR) { $1->v3error("Unknown Error Code: " << *$3); } - $2->v3warn(DEPRECATED, "Deprecated -msg in configuration files, use -rule instead."); } | yVLT_LINT_ON yVLT_D_RULE idAny { $$ = V3ErrorCode((*$3).c_str()); if ($$ == V3ErrorCode::EC_ERROR) { $1->v3error("Unknown Error Code: " << *$3); } } diff --git a/test_regress/t/t_vlt_warn.vlt b/test_regress/t/t_vlt_warn.vlt index e4f858780..33725c2ca 100644 --- a/test_regress/t/t_vlt_warn.vlt +++ b/test_regress/t/t_vlt_warn.vlt @@ -11,7 +11,7 @@ lint_off -rule CASEINCOMPLETE -file "t/t_vlt_warn.v" lint_off -rule WIDTH -file "t/t_vlt_warn.v" -lines 19 lint_off -rule DECLFILENAME -file "*/t_vlt_warn.v" // Test wildcard filenames -lint_off -msg WIDTH -file "*/t_vlt_warn.v" -lines 20-20 +lint_off -rule WIDTH -file "*/t_vlt_warn.v" -lines 20-20 // Test global disables lint_off -file "*/t_vlt_warn.v" -lines 21-21 // Test match diff --git a/test_regress/t/t_vlt_warn_bad.out b/test_regress/t/t_vlt_warn_bad.out index 29c29c3b9..f8f64f115 100644 --- a/test_regress/t/t_vlt_warn_bad.out +++ b/test_regress/t/t_vlt_warn_bad.out @@ -1,10 +1,7 @@ -%Warning-DEPRECATED: t/t_vlt_warn_bad.vlt:12:10: Deprecated -msg in configuration files, use -rule instead. - 12 | lint_off -msg WIDTH -file "*/t_vlt_warn.v" -lines 19-19 - | ^~~~ - ... For warning description see https://verilator.org/warn/DEPRECATED?v=latest - ... Use "/* verilator lint_off DEPRECATED */" and lint_on around source to disable this message. %Warning-WIDTH: t/t_vlt_warn.v:21:33: Operator ASSIGN expects 1 bits on the Assign RHS, but Assign RHS's CONST '2'h3' generates 2 bits. : ... In instance t 21 | reg width_warn3_var_line20 = 2'b11; | ^~~~~ + ... For warning description see https://verilator.org/warn/WIDTH?v=latest + ... Use "/* verilator lint_off WIDTH */" and lint_on around source to disable this message. %Error: Exiting due to diff --git a/test_regress/t/t_vlt_warn_bad.vlt b/test_regress/t/t_vlt_warn_bad.vlt index 3b07dacac..d7becb03f 100644 --- a/test_regress/t/t_vlt_warn_bad.vlt +++ b/test_regress/t/t_vlt_warn_bad.vlt @@ -9,7 +9,7 @@ lint_off -rule CASEINCOMPLETE -file "t/t_vlt_warn.v" lint_off -rule WIDTH -file "t/t_vlt_warn.v" -lines 18 // Test wildcard filenames -lint_off -msg WIDTH -file "*/t_vlt_warn.v" -lines 19-19 +lint_off -rule WIDTH -file "*/t_vlt_warn.v" -lines 19-19 // Test global disables lint_off -file "*/t_vlt_warn.v" -lines 20-20