From 08d041cb932a10ca95200202332c65239fd23ada Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Tue, 30 Apr 2019 19:16:41 -0400 Subject: [PATCH] Add error when use parameters without value, bug1424. --- Changes | 2 ++ src/V3Param.cpp | 36 ++++++++++++-------- src/verilog.y | 4 ++- test_regress/t/t_param_default_bad.out | 2 ++ test_regress/t/t_param_default_bad.pl | 12 +++---- test_regress/t/t_param_default_presv_bad.out | 2 ++ test_regress/t/t_param_default_presv_bad.pl | 21 ++++++++++++ 7 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 test_regress/t/t_param_default_bad.out create mode 100644 test_regress/t/t_param_default_presv_bad.out create mode 100755 test_regress/t/t_param_default_presv_bad.pl diff --git a/Changes b/Changes index 8e37c201e..39ea0bbbe 100644 --- a/Changes +++ b/Changes @@ -6,6 +6,8 @@ The contributors that suggested a given feature are shown in []. Thanks! **** Support '#' comments in $readmem, bug1411. [Frederick Requin] +**** Add error when use parameters without value, bug1424. [Peter Gerst] + **** Fix missing VL_SHIFTL_ errors, bug1412, bug1415. [Larry Lee] **** Fix MinGW GCC 6 printf formats, bug1413. [Sergey Kvachonok] diff --git a/src/V3Param.cpp b/src/V3Param.cpp index e03f63a5b..a0976ffb8 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -271,21 +271,29 @@ private: // Make sure all parameters are constantified virtual void visit(AstVar* nodep) { - if (!nodep->user5SetOnce()) { // Process once + if (!nodep->user5SetOnce()) { // Process once iterateChildren(nodep); - if (nodep->isParam()) { - if (!nodep->valuep()) { nodep->v3fatalSrc("Parameter without initial value"); } - V3Const::constifyParamsEdit(nodep); // The variable, not just the var->init() - if (!VN_IS(nodep->valuep(), Const)) { // Complex init, like an array - // Make a new INITIAL to set the value. - // This allows the normal array/struct handling code to properly initialize the parameter - nodep->addNext(new AstInitial(nodep->fileline(), - new AstAssign(nodep->fileline(), - new AstVarRef(nodep->fileline(), nodep, true), - nodep->valuep()->cloneTree(true)))); - } - } - } + if (nodep->isParam()) { + if (!nodep->valuep()) { + nodep->v3error("Parameter without initial value is never given value" + <<" (IEEE 1800-2017 6.20.1): " + <prettyName()); + } else { + V3Const::constifyParamsEdit(nodep); // The variable, not just the var->init() + if (!VN_IS(nodep->valuep(), Const)) { // Complex init, like an array + // Make a new INITIAL to set the value. + // This allows the normal array/struct handling code to properly + // initialize the parameter. + nodep->addNext( + new AstInitial(nodep->fileline(), + new AstAssign( + nodep->fileline(), + new AstVarRef(nodep->fileline(), nodep, true), + nodep->valuep()->cloneTree(true)))); + } + } + } + } } // Make sure varrefs cause vars to constify before things above virtual void visit(AstVarRef* nodep) { diff --git a/src/verilog.y b/src/verilog.y index 8e94a5e4e..8f7ca3b8e 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -2085,7 +2085,9 @@ param_assignment: // ==IEEE: param_assignment id/*new-parameter*/ variable_dimensionListE sigAttrListE '=' exprOrDataType /**/ { $$ = VARDONEA($1,*$1, $2, $3); $$->valuep($5); } | id/*new-parameter*/ variable_dimensionListE sigAttrListE - /**/ { $$ = VARDONEA($1,*$1, $2, $3); } + /**/ { $$ = VARDONEA($1,*$1, $2, $3); + if ($1->language() < V3LangCode::L1800_2009) { + $1->v3error("Parameter requires default value, or use IEEE 1800-2009 or later."); } } ; list_of_param_assignments: // ==IEEE: list_of_param_assignments diff --git a/test_regress/t/t_param_default_bad.out b/test_regress/t/t_param_default_bad.out new file mode 100644 index 000000000..91c6c6ba3 --- /dev/null +++ b/test_regress/t/t_param_default_bad.out @@ -0,0 +1,2 @@ +%Error: t/t_param_default_bad.v:6: Parameter without initial value is never given value (IEEE 1800-2017 6.20.1): Foo +%Error: Exiting due to diff --git a/test_regress/t/t_param_default_bad.pl b/test_regress/t/t_param_default_bad.pl index 0d35c2868..3ce8c1ef2 100755 --- a/test_regress/t/t_param_default_bad.pl +++ b/test_regress/t/t_param_default_bad.pl @@ -7,15 +7,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Lesser General Public License Version 3 or the Perl Artistic License # Version 2.0. -scenarios(simulator => 1); +scenarios(vlt => 1); compile( - fails => 1, - expect => -'%Error: Internal Error: t/t_param_default_bad.v:6: ../V3Param.cpp:\d+: Parameter without initial value -%Error: Internal Error: See the manual and http://www.veripool.org/verilator for more assistance. -.*%Error: Command Failed.*', - ); + v_flags2 => ["--lint-only"], + fails => 1, + expect_filename => $Self->{golden_filename}, + ); ok(1); 1; diff --git a/test_regress/t/t_param_default_presv_bad.out b/test_regress/t/t_param_default_presv_bad.out new file mode 100644 index 000000000..6661a2f71 --- /dev/null +++ b/test_regress/t/t_param_default_presv_bad.out @@ -0,0 +1,2 @@ +%Error: t/t_param_default_bad.v:6: Parameter requires default value, or use IEEE 1800-2009 or later. +%Error: Exiting due to diff --git a/test_regress/t/t_param_default_presv_bad.pl b/test_regress/t/t_param_default_presv_bad.pl new file mode 100755 index 000000000..9de626241 --- /dev/null +++ b/test_regress/t/t_param_default_presv_bad.pl @@ -0,0 +1,21 @@ +#!/usr/bin/perl +if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; } +# DESCRIPTION: Verilator: Verilog Test driver/expect definition +# +# Copyright 2003 by Wilson Snyder. This program is free software; you can +# redistribute it and/or modify it under the terms of either the GNU +# Lesser General Public License Version 3 or the Perl Artistic License +# Version 2.0. + +scenarios(vlt => 1); + +top_filename("t/t_param_default_bad.v"); + +compile( + v_flags2 => ["--lint-only --language 1800-2005"], + fails => 1, + expect_filename => $Self->{golden_filename}, + ); + +ok(1); +1;