From 9eae1fa3775026550e2336e566b1a6397ac7f172 Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Thu, 18 May 2017 22:52:28 -0700 Subject: [PATCH 1/2] verilator: bump to version 3.904 --- emulator/Makefrag-verilator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emulator/Makefrag-verilator b/emulator/Makefrag-verilator index 4e8ed1a6..249c7c18 100644 --- a/emulator/Makefrag-verilator +++ b/emulator/Makefrag-verilator @@ -21,7 +21,7 @@ $(generated_dir_debug)/%.fir $(generated_dir_debug)/%.d: $(FIRRTL_JAR) $(chisel_ $(FIRRTL) $(patsubst %,-i %,$(filter %.fir,$^)) -o $@ -X verilog # Build and install our own Verilator, to work around versionining issues. -VERILATOR_VERSION=3.884 +VERILATOR_VERSION=3.904 VERILATOR_SRCDIR ?= verilator/src/verilator-$(VERILATOR_VERSION) VERILATOR_TARGET := $(abspath verilator/install/bin/verilator) INSTALLED_VERILATOR ?= $(VERILATOR_TARGET) From 6a7e6ab3250fb1993e5e924b6eb609448e8032e5 Mon Sep 17 00:00:00 2001 From: "Wesley W. Terpstra" Date: Thu, 18 May 2017 22:54:40 -0700 Subject: [PATCH 2/2] plusarg_reader: support verilator --- vsrc/plusarg_reader.v | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/vsrc/plusarg_reader.v b/vsrc/plusarg_reader.v index e369833e..7a7bacc9 100644 --- a/vsrc/plusarg_reader.v +++ b/vsrc/plusarg_reader.v @@ -10,13 +10,11 @@ reg [31:0] myplus; assign out = myplus; initial begin +`ifdef SYNTHESIS myplus = DEFAULT; -`ifndef SYNTHESIS -`ifndef verilator - // Work-around for https://www.veripool.org/issues/1165 +`else if (!$value$plusargs(FORMAT, myplus)) myplus = DEFAULT; `endif -`endif end endmodule