From f99f06f425c20b34825e29ab9af51c83b69329ab Mon Sep 17 00:00:00 2001 From: dataphract Date: Mon, 28 Nov 2022 21:58:38 -0600 Subject: [PATCH] fix: handle major version 5+ in preproc checks --- verilated/src/verilated_shim.cpp | 6 +++--- verilated/src/verilatedvcdc_shim.cpp | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/verilated/src/verilated_shim.cpp b/verilated/src/verilated_shim.cpp index 65bb033..1414f86 100644 --- a/verilated/src/verilated_shim.cpp +++ b/verilated/src/verilated_shim.cpp @@ -87,7 +87,7 @@ verilated_fatal_on_vpi_error() { return Verilated::fatalOnVpiError() ? 1 : 0; } -#if VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 38 +#if VERILATOR_VERSION_MAJOR > 4 || (VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 38) typedef void (*voidp_cb)(void*); // Callback type for below /// Callbacks to run on global flush @@ -121,7 +121,7 @@ void verilator_run_exit_callbacks() { Verilated::runExitCallbacks(); } -#else // !(VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 38) +#else // !(VERILATOR_VERSION_MAJOR > 4 || (VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 38)) /// Flush callback for VCD waves void verilated_flush_cb(VerilatedVoidCb cb) { @@ -132,7 +132,7 @@ void verilated_flush_call() { Verilated::flushCall(); } -#endif // VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 38 +#endif // VERILATOR_VERSION_MAJOR > 4 || (VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 38) /// Record command line arguments, for retrieval by $test$plusargs/$value$plusargs void diff --git a/verilated/src/verilatedvcdc_shim.cpp b/verilated/src/verilatedvcdc_shim.cpp index dfef48b..9d25639 100644 --- a/verilated/src/verilatedvcdc_shim.cpp +++ b/verilated/src/verilatedvcdc_shim.cpp @@ -41,11 +41,19 @@ verilatedvcdc_open_next(VerilatedVcdC* vcd, int inc_filename) { vcd->openNext(inc_filename ? true : false); } +#if VERILATOR_VERSION_MAJOR > 4 || (VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 226) +/// Set size in bytes after which new file should be created. +void +verilatedvcdc_rollover_size(VerilatedVcdC* vcd, size_t size) { + vcd->rolloverSize(size); +} +#else // !(VERILATOR_VERSION_MAJOR > 4 || (VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 226)) /// Set size in megabytes after which new file should be created void verilatedvcdc_rollover_mb(VerilatedVcdC* vcd, size_t rolloverMB) { vcd->rolloverMB(rolloverMB); } +#endif // VERILATOR_VERSION_MAJOR > 4 || (VERILATOR_VERSION_MAJOR == 4 && VERILATOR_VERSION_MINOR >= 226) /// Close dump void