Merge pull request #755 from freechipsproject/verilator-plusargs

Verilator plusargs

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)

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