Avoid internal on unsupported; make tests more stable otherwise on internal.

This commit is contained in:
Wilson Snyder 2019-11-04 21:11:15 -05:00
parent e40ad4a095
commit cc4cb4e006
5 changed files with 15 additions and 8 deletions

View File

@ -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 "<<nodep->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());
}
}

View File

@ -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;

View File

@ -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++)
^~~

View File

@ -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

View File

@ -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