luke/verilator
1
0
Fork 0
mirror of https://github.com/verilator/verilator.git synced 2026-08-30 17:51:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve format of runtime errors, especially DIDNOTCONVERGE

Browse Source
This commit is contained in:
Wilson Snyder
2026-01-08 01:01:54 -05:00
parent da14e7c4bb
commit c75fb4cdae
11 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/verilated.cpp
+38 -27
View File
@@ -112,6 +112,36 @@ VerilatedContext* Verilated::s_lastContextp = nullptr;
// Internal note: Globals may multi-construct, see verilated.cpp top.
thread_local Verilated::ThreadLocal Verilated::t_s;
//===========================================================================
// Warning print helper
void vl_print_warn_error(const char* prefix, const char* filename, int linenum,
const char* msg) VL_MT_UNSAFE {
// A msg of "ERRORCODE: ..." is a code that changes to a prefix, e.g. "%Error-ERRORCODE: ..."
// This avoids changing public API of the vl_stop and related functions.
const char* msgNoCp = msg;
for (; isupper(*msgNoCp); ++msgNoCp);
if (msgNoCp[0] == ':' && msgNoCp[1] == ' ') {
const int codeWidth = static_cast<int>(msgNoCp - msg);
msgNoCp += 2;
if (filename && filename[0]) {
VL_PRINTF( // Not VL_PRINTF_MT, already on main thread
"%s-%.*s: %s:%d: %s\n", prefix, codeWidth, msg, filename, linenum, msgNoCp);
} else {
VL_PRINTF( // Not VL_PRINTF_MT, already on main thread
"%s-%.*s: %s\n", prefix, codeWidth, msg, msgNoCp);
}
} else {
if (filename && filename[0]) {
VL_PRINTF( // Not VL_PRINTF_MT, already on main thread
"%s: %s:%d: %s\n", prefix, filename, linenum, msg);
} else {
VL_PRINTF( // Not VL_PRINTF_MT, already on main thread
"%s: %s\n", prefix, msg);
}
}
}
//===========================================================================
// User definable functions
// Note a TODO is a future version of the API will pass a structure so that
@@ -119,8 +149,7 @@ thread_local Verilated::ThreadLocal Verilated::t_s;
#ifndef VL_USER_FINISH ///< Define this to override the vl_finish function
void vl_finish(const char* filename, int linenum, const char* hier) VL_MT_UNSAFE {
// hier is unused in the default implementation.
(void)hier;
(void)hier; // hier is unused in the default implementation.
VL_PRINTF( // Not VL_PRINTF_MT, already on main thread
"- %s:%d: Verilog $finish\n", filename, linenum);
Verilated::threadContextp()->gotFinish(true);
@@ -136,12 +165,7 @@ void vl_stop(const char* filename, int linenum, const char* hier) VL_MT_UNSAFE {
if (Verilated::threadContextp()->fatalOnError()) {
vl_fatal(filename, linenum, hier, msg);
} else {
if (filename && filename[0]) {
// Not VL_PRINTF_MT, already on main thread
VL_PRINTF("%%Error: %s:%d: %s\n", filename, linenum, msg);
} else {
VL_PRINTF("%%Error: %s\n", msg);
}
vl_print_warn_error("%Error", filename, linenum, msg);
Verilated::runFlushCallbacks();
}
}
@@ -149,16 +173,10 @@ void vl_stop(const char* filename, int linenum, const char* hier) VL_MT_UNSAFE {
#ifndef VL_USER_FATAL ///< Define this to override the vl_fatal function
void vl_fatal(const char* filename, int linenum, const char* hier, const char* msg) VL_MT_UNSAFE {
// hier is unused in the default implementation.
(void)hier;
(void)hier; // hier is unused in the default implementation.
Verilated::threadContextp()->gotError(true);
Verilated::threadContextp()->gotFinish(true);
if (filename && filename[0]) {
// Not VL_PRINTF_MT, already on main thread
VL_PRINTF("%%Error: %s:%d: %s\n", filename, linenum, msg);
} else {
VL_PRINTF("%%Error: %s\n", msg);
}
vl_print_warn_error("%Error", filename, linenum, msg);
Verilated::runFlushCallbacks();
VL_PRINTF("Aborting...\n"); // Not VL_PRINTF_MT, already on main thread
@@ -185,9 +203,8 @@ void vl_stop_maybe(const char* filename, int linenum, const char* hier, bool may
&& Verilated::threadContextp()->errorCount() < Verilated::threadContextp()->errorLimit()) {
// Do just once when cross error limit
if (Verilated::threadContextp()->errorCount() == 1) {
VL_PRINTF( // Not VL_PRINTF_MT, already on main thread
"-Info: %s:%d: %s\n", filename, linenum,
"Verilog $stop, ignored due to +verilator+error+limit");
vl_print_warn_error("-Info", filename, linenum,
"Verilog $stop, ignored due to +verilator+error+limit");
}
} else {
vl_stop(filename, linenum, hier);
@@ -197,14 +214,8 @@ void vl_stop_maybe(const char* filename, int linenum, const char* hier, bool may
#ifndef VL_USER_WARN ///< Define this to override the vl_warn function
void vl_warn(const char* filename, int linenum, const char* hier, const char* msg) VL_MT_UNSAFE {
// hier is unused in the default implementation.
(void)hier;
if (filename && filename[0]) {
// Not VL_PRINTF_MT, already on main thread
VL_PRINTF("%%Warning: %s:%d: %s\n", filename, linenum, msg);
} else {
VL_PRINTF("%%Warning: %s\n", msg);
}
(void)hier; // hier is unused in the default implementation.
vl_print_warn_error("%Warning", filename, linenum, msg);
Verilated::runFlushCallbacks();
}
#endif