From 7a74ddc1afd86a280ab9d1c02cf4533cd07bf79d Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Mon, 2 Sep 2024 18:48:49 -0400 Subject: [PATCH] Internals: Fix some getter/setter ordering. No functional change intended. --- include/verilated.h | 40 ++++++++++++++++++++-------------------- include/verilated_cov.h | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/verilated.h b/include/verilated.h index 654b08d4b..65ff30c95 100644 --- a/include/verilated.h +++ b/include/verilated.h @@ -796,8 +796,6 @@ class Verilated final { public: // METHODS - User called - /// Enable debug of internal verilated code - static void debug(int level) VL_MT_SAFE; #ifdef VL_DEBUG /// Return debug level /// When multithreaded this may not immediately react to another thread @@ -807,6 +805,8 @@ public: /// Return constant 0 debug level, so C++'s optimizer rips up static constexpr int debug() VL_PURE { return 0; } #endif + /// Enable debug of internal verilated code + static void debug(int level) VL_MT_SAFE; /// Set the last VerilatedContext accessed /// Generally threadContextp(value) should be called instead @@ -865,44 +865,44 @@ public: static const char* commandArgsPlusMatch(const char* prefixp) VL_MT_SAFE { return Verilated::threadContextp()->commandArgsPlusMatch(prefixp); } - /// Call VerilatedContext::errorLimit using current thread's VerilatedContext - static void errorLimit(int val) VL_MT_SAFE { Verilated::threadContextp()->errorLimit(val); } /// Return VerilatedContext::errorLimit using current thread's VerilatedContext static int errorLimit() VL_MT_SAFE { return Verilated::threadContextp()->errorLimit(); } + /// Call VerilatedContext::errorLimit using current thread's VerilatedContext + static void errorLimit(int val) VL_MT_SAFE { Verilated::threadContextp()->errorLimit(val); } + /// Return VerilatedContext::fatalOnError using current thread's VerilatedContext + static bool fatalOnError() VL_MT_SAFE { return Verilated::threadContextp()->fatalOnError(); } /// Call VerilatedContext::fatalOnError using current thread's VerilatedContext static void fatalOnError(bool flag) VL_MT_SAFE { Verilated::threadContextp()->fatalOnError(flag); } - /// Return VerilatedContext::fatalOnError using current thread's VerilatedContext - static bool fatalOnError() VL_MT_SAFE { return Verilated::threadContextp()->fatalOnError(); } - /// Call VerilatedContext::fatalOnVpiError using current thread's VerilatedContext - static void fatalOnVpiError(bool flag) VL_MT_SAFE { - Verilated::threadContextp()->fatalOnVpiError(flag); - } /// Return VerilatedContext::fatalOnVpiError using current thread's VerilatedContext static bool fatalOnVpiError() VL_MT_SAFE { return Verilated::threadContextp()->fatalOnVpiError(); } - /// Call VerilatedContext::gotError using current thread's VerilatedContext - static void gotError(bool flag) VL_MT_SAFE { Verilated::threadContextp()->gotError(flag); } + /// Call VerilatedContext::fatalOnVpiError using current thread's VerilatedContext + static void fatalOnVpiError(bool flag) VL_MT_SAFE { + Verilated::threadContextp()->fatalOnVpiError(flag); + } /// Return VerilatedContext::gotError using current thread's VerilatedContext static bool gotError() VL_MT_SAFE { return Verilated::threadContextp()->gotError(); } - /// Call VerilatedContext::gotFinish using current thread's VerilatedContext - static void gotFinish(bool flag) VL_MT_SAFE { Verilated::threadContextp()->gotFinish(flag); } + /// Call VerilatedContext::gotError using current thread's VerilatedContext + static void gotError(bool flag) VL_MT_SAFE { Verilated::threadContextp()->gotError(flag); } /// Return VerilatedContext::gotFinish using current thread's VerilatedContext static bool gotFinish() VL_MT_SAFE { return Verilated::threadContextp()->gotFinish(); } - /// Call VerilatedContext::randReset using current thread's VerilatedContext - static void randReset(int val) VL_MT_SAFE { Verilated::threadContextp()->randReset(val); } + /// Call VerilatedContext::gotFinish using current thread's VerilatedContext + static void gotFinish(bool flag) VL_MT_SAFE { Verilated::threadContextp()->gotFinish(flag); } /// Return VerilatedContext::randReset using current thread's VerilatedContext static int randReset() VL_MT_SAFE { return Verilated::threadContextp()->randReset(); } - /// Call VerilatedContext::randSeed using current thread's VerilatedContext - static void randSeed(int val) VL_MT_SAFE { Verilated::threadContextp()->randSeed(val); } + /// Call VerilatedContext::randReset using current thread's VerilatedContext + static void randReset(int val) VL_MT_SAFE { Verilated::threadContextp()->randReset(val); } /// Return VerilatedContext::randSeed using current thread's VerilatedContext static int randSeed() VL_MT_SAFE { return Verilated::threadContextp()->randSeed(); } - /// Call VerilatedContext::time using current thread's VerilatedContext - static void time(uint64_t val) VL_MT_SAFE { Verilated::threadContextp()->time(val); } + /// Call VerilatedContext::randSeed using current thread's VerilatedContext + static void randSeed(int val) VL_MT_SAFE { Verilated::threadContextp()->randSeed(val); } /// Return VerilatedContext::time using current thread's VerilatedContext static uint64_t time() VL_MT_SAFE { return Verilated::threadContextp()->time(); } + /// Call VerilatedContext::time using current thread's VerilatedContext + static void time(uint64_t val) VL_MT_SAFE { Verilated::threadContextp()->time(val); } /// Call VerilatedContext::timeInc using current thread's VerilatedContext static void timeInc(uint64_t add) VL_MT_UNSAFE { Verilated::threadContextp()->timeInc(add); } // Deprecated diff --git a/include/verilated_cov.h b/include/verilated_cov.h index 13c3d2806..d27b648af 100644 --- a/include/verilated_cov.h +++ b/include/verilated_cov.h @@ -92,8 +92,8 @@ public: std::string defaultFilename() VL_MT_SAFE; /// Make all data per_instance, overriding point's per_instance void forcePerInstance(bool flag) VL_MT_SAFE; - void write() VL_MT_SAFE { write(defaultFilename()); } /// Write all coverage data to a file + void write() VL_MT_SAFE { write(defaultFilename()); } void write(const std::string& filename) VL_MT_SAFE; /// Clear coverage points (and call delete on all items) void clear() VL_MT_SAFE; @@ -165,8 +165,8 @@ public: /// Return default filename for the current thread static std::string defaultFilename() VL_MT_SAFE { return threadCovp()->defaultFilename(); } /// Write all coverage data to a file for the current thread - static void write(const std::string& filename) VL_MT_SAFE { threadCovp()->write(filename); } static void write() VL_MT_SAFE { write(defaultFilename()); } + static void write(const std::string& filename) VL_MT_SAFE { threadCovp()->write(filename); } /// Clear coverage points (and call delete on all items) for the current thread static void clear() VL_MT_SAFE { threadCovp()->clear(); } /// Clear items not matching the provided string for the current thread