From 8203c79f76eec20b8b3e5a3f07bd228bc410650d Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Thu, 14 Jan 2010 18:34:49 -0500 Subject: [PATCH] /sformat should accept rvalue expressions --- src/verilog.y | 4 ++-- test_regress/t/t_flag_future.pl | 7 +++++-- test_verilated/Makefile | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/verilog.y b/src/verilog.y index 9db7ac8a5..f10a29fbc 100644 --- a/src/verilog.y +++ b/src/verilog.y @@ -2015,8 +2015,8 @@ system_t_call: // IEEE: system_tf_call (as task) | yD_STOP parenE { $$ = new AstStop($1); } | yD_STOP '(' expr ')' { $$ = new AstStop($1); } // - | yD_SFORMAT '(' expr ',' str commaVRDListE ')' { $$ = new AstSFormat($1,$3,*$5,$6); } - | yD_SWRITE '(' expr ',' str commaVRDListE ')' { $$ = new AstSFormat($1,$3,*$5,$6); } + | yD_SFORMAT '(' expr ',' str commaEListE ')' { $$ = new AstSFormat($1,$3,*$5,$6); } + | yD_SWRITE '(' expr ',' str commaEListE ')' { $$ = new AstSFormat($1,$3,*$5,$6); } // | yD_DISPLAY parenE { $$ = new AstDisplay($1,AstDisplayType::DISPLAY,"", NULL,NULL); } | yD_DISPLAY '(' str commaEListE ')' { $$ = new AstDisplay($1,AstDisplayType::DISPLAY,*$3,NULL,$4); } diff --git a/test_regress/t/t_flag_future.pl b/test_regress/t/t_flag_future.pl index 091055019..b4298f847 100755 --- a/test_regress/t/t_flag_future.pl +++ b/test_regress/t/t_flag_future.pl @@ -8,8 +8,11 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di # Version 2.0. compile ( - verilator_flags2 => [qw(--lint-only -Wfuture-FUTURE1 -Wfuture-FUTURE2)], - ); + make_top_shell => 0, + make_main => 0, + verilator_flags2 => [qw(--lint-only -Wfuture-FUTURE1 -Wfuture-FUTURE2)], + verilator_make_gcc => 0, + ); ok(1); 1; diff --git a/test_verilated/Makefile b/test_verilated/Makefile index 85805d517..fd3c353c9 100644 --- a/test_verilated/Makefile +++ b/test_verilated/Makefile @@ -26,7 +26,7 @@ include $(VERILATOR_ROOT)/include/verilated.mk VERILATOR_SW += ifeq ($(VERILATOR_NO_DEBUG),) - VERILATOR_SW += --debug + VERILATOR_SW += --debug --no-dump-tree endif PERL_PACKAGES_OK := $(shell $(PERL) -e 'eval "use Bit::Vector; print 1;";')