diff --git a/src/V3ProtectLib.cpp b/src/V3ProtectLib.cpp index 136532dac..f88455f04 100644 --- a/src/V3ProtectLib.cpp +++ b/src/V3ProtectLib.cpp @@ -344,7 +344,7 @@ class ProtectVisitor : public AstNVisitor { virtual void visit(AstVar* nodep) { if (!nodep->isIO()) return; if (VN_IS(nodep->dtypep(), UnpackArrayDType)) { - nodep->v3fatalSrc("Unsupported: unpacked arrays with protect-lib"); + nodep->v3error("Unsupported: unpacked arrays with protect-lib on "<prettyNameQ()); } if (nodep->direction() == VDirection::INPUT) { if (nodep->isUsedClock()) { @@ -355,8 +355,8 @@ class ProtectVisitor : public AstNVisitor { } else if (nodep->direction() == VDirection::OUTPUT) { handleOutput(nodep); } else { - nodep->v3fatalSrc("Unsupported port direction for protect-lib: "<< - nodep->direction().ascii()); + nodep->v3error("Unsupported: protect-lib port direction: "<< + nodep->direction().ascii()); } } diff --git a/test_regress/driver.pl b/test_regress/driver.pl index aa79e7a24..1f3094748 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -1958,6 +1958,10 @@ sub files_identical { && !/^-node:/ && !/^dot [^\n]+\n/ } @l1; + @l1 = map { + s/(Internal Error: [^\n]+\.cpp):[0-9]+:/$1:#:/; + $_; + } @l1; for (my $l=0; $l<=$#l1; ++$l) { # Don't put control chars into our source repository $l1[$l] =~ s/\r/<#013>/mig; diff --git a/test_regress/t/t_param_noval_bad.out b/test_regress/t/t_param_noval_bad.out index 054055470..9ce66cb4a 100644 --- a/test_regress/t/t_param_noval_bad.out +++ b/test_regress/t/t_param_noval_bad.out @@ -23,7 +23,7 @@ module t #(parameter P); : ... In instance t for (j=0; P; j++) ^~~ -%Error: Internal Error: t/t_param_noval_bad.v:9: ../V3Param.cpp:505: GENFOR should have been wrapped in BEGIN +%Error: Internal Error: t/t_param_noval_bad.v:9: ../V3Param.cpp:#: GENFOR should have been wrapped in BEGIN : ... In instance t for (j=0; P; j++) ^~~ diff --git a/test_regress/t/t_prot_lib_inout_bad.out b/test_regress/t/t_prot_lib_inout_bad.out index 87ca06973..6c5b91eb6 100644 --- a/test_regress/t/t_prot_lib_inout_bad.out +++ b/test_regress/t/t_prot_lib_inout_bad.out @@ -1,4 +1,4 @@ -%Error: Internal Error: t/t_prot_lib_inout_bad.v:8: ../V3ProtectLib.cpp:359: Unsupported port direction for protect-lib: INOUT +%Error: t/t_prot_lib_inout_bad.v:8: Unsupported: protect-lib port direction: INOUT inout z, ^ - ... See the manual and http://www.veripool.org/verilator for more assistance. +%Error: Exiting due to diff --git a/test_regress/t/t_prot_lib_unpacked_bad.out b/test_regress/t/t_prot_lib_unpacked_bad.out index f301eb959..4c5fa6726 100644 --- a/test_regress/t/t_prot_lib_unpacked_bad.out +++ b/test_regress/t/t_prot_lib_unpacked_bad.out @@ -1,4 +1,7 @@ -%Error: Internal Error: t/t_prot_lib_unpacked_bad.v:6: ../V3ProtectLib.cpp:347: Unsupported: unpacked arrays with protect-lib +%Error: t/t_prot_lib_unpacked_bad.v:6: Unsupported: unpacked arrays with protect-lib on 'unpacked_in' input unpacked_in [7:0], ^~~~~~~~~~~ - ... See the manual and http://www.veripool.org/verilator for more assistance. +%Error: t/t_prot_lib_unpacked_bad.v:7: Unsupported: unpacked arrays with protect-lib on 'unpacked_out' + output unpacked_out [7:0]); + ^~~~~~~~~~~~ +%Error: Exiting due to