diff --git a/FIXME_bug_on_clang b/FIXME_bug_on_clang new file mode 100644 index 000000000..e69de29bb diff --git a/include/verilated.cpp b/include/verilated.cpp index 895118fca..a50023a77 100644 --- a/include/verilated.cpp +++ b/include/verilated.cpp @@ -1758,7 +1758,7 @@ static const char* formatBinary(int nBits, vluint32_t bits) { VlReadMem::VlReadMem(bool hex, int bits, const std::string& filename, QData start, QData end) : m_hex{hex} , m_bits{bits} - , m_filename{filename} + , m_filename(filename) // Need () or GCC 4.8 false warning , m_end{end} , m_addr{start} , m_linenum{0} { diff --git a/include/verilated.h b/include/verilated.h index 4cc5cd6ee..71b370b47 100644 --- a/include/verilated.h +++ b/include/verilated.h @@ -163,7 +163,7 @@ private: public: explicit VerilatedLockGuard(VerilatedMutex& mutexr) VL_ACQUIRE(mutexr) - : m_mutexr{mutexr} { + : m_mutexr(mutexr) { // Need () or GCC 4.8 false warning m_mutexr.lock(); } ~VerilatedLockGuard() VL_RELEASE() { m_mutexr.unlock(); } diff --git a/include/verilated_sym_props.h b/include/verilated_sym_props.h index 9d5b9fb4a..ca2689108 100644 --- a/include/verilated_sym_props.h +++ b/include/verilated_sym_props.h @@ -106,13 +106,13 @@ public: VerilatedVarProps(VerilatedVarType vltype, int vlflags) : m_magic{MAGIC} , m_vltype{vltype} - , m_vlflags{VerilatedVarFlags(vlflags)} + , m_vlflags(VerilatedVarFlags(vlflags)) // Need () or GCC 4.8 false warning , m_pdims{0} , m_udims{0} {} VerilatedVarProps(VerilatedVarType vltype, int vlflags, Unpacked, int udims, const int* ulims) : m_magic{MAGIC} , m_vltype{vltype} - , m_vlflags{VerilatedVarFlags(vlflags)} + , m_vlflags(VerilatedVarFlags(vlflags)) // Need () or GCC 4.8 false warning , m_pdims{0} , m_udims{udims} { initUnpacked(ulims); @@ -122,7 +122,7 @@ public: VerilatedVarProps(VerilatedVarType vltype, int vlflags, Packed, int pl, int pr) : m_magic{MAGIC} , m_vltype{vltype} - , m_vlflags{VerilatedVarFlags(vlflags)} + , m_vlflags(VerilatedVarFlags(vlflags)) // Need () or GCC 4.8 false warning , m_pdims{1} , m_udims{0} , m_packed{pl, pr} {} @@ -130,7 +130,7 @@ public: int udims, const int* ulims) : m_magic{MAGIC} , m_vltype{vltype} - , m_vlflags{VerilatedVarFlags(vlflags)} + , m_vlflags(VerilatedVarFlags(vlflags)) // Need () or GCC 4.8 false warning , m_pdims{1} , m_udims{udims} , m_packed{pl, pr} { diff --git a/test_regress/t/TestSimulator.h b/test_regress/t/TestSimulator.h index 5d791c6c9..63d537eff 100644 --- a/test_regress/t/TestSimulator.h +++ b/test_regress/t/TestSimulator.h @@ -75,4 +75,4 @@ public: } }; -#define VPI_HANDLE(signal) vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted(signal), nullptr); +#define VPI_HANDLE(signal) vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted(signal), NULL); diff --git a/test_regress/t/TestVpi.h b/test_regress/t/TestVpi.h index 5e7dc99f4..843d65c4c 100644 --- a/test_regress/t/TestVpi.h +++ b/test_regress/t/TestVpi.h @@ -20,14 +20,14 @@ class TestVpiHandle { public: TestVpiHandle() - : m_handle(nullptr) + : m_handle(NULL) , m_free(true) {} TestVpiHandle(vpiHandle h) : m_handle(h) , m_free(true) {} ~TestVpiHandle() { if (m_handle && m_free) { - { vpi_free_object(m_handle); m_handle = nullptr; } + { vpi_free_object(m_handle); m_handle = NULL; } } } operator vpiHandle() const { return m_handle; } diff --git a/test_regress/t/t_dpi_arg_inout_type.cpp b/test_regress/t/t_dpi_arg_inout_type.cpp index 147e19595..0c0609784 100644 --- a/test_regress/t/t_dpi_arg_inout_type.cpp +++ b/test_regress/t/t_dpi_arg_inout_type.cpp @@ -159,7 +159,7 @@ void i_shortreal(float* x) { void i_chandle(void** x) { static int n = 0; printf("i_chandle %d\n", n); - if (*x != nullptr) stop(); + if (*x) stop(); *x = (n % 2) ? reinterpret_cast(&i_chandle) : 0; n++; } @@ -287,7 +287,7 @@ void i_shortreal_t(float* x) { void i_chandle_t(void** x) { static int n = 0; printf("i_chandle_t %d\n", n); - if (*x != nullptr) stop(); + if (*x) stop(); *x = (n % 2) ? 0 : reinterpret_cast(&i_chandle_t); n++; } @@ -955,16 +955,16 @@ void check_exports() { x_chandle = reinterpret_cast(&e_chandle); x_string = "Good"; } else { - x_chandle = nullptr; + x_chandle = NULL; x_string = "Bye"; } e_chandle(&x_chandle); e_string(&x_string); if ((n % 2) == 0) { - if (x_chandle != nullptr) stop(); + if (x_chandle) stop(); if (strcmp(x_string, "Hello") != 0) stop(); } else { - if (x_chandle != nullptr) stop(); + if (x_chandle) stop(); if (strcmp(x_string, "World") != 0) stop(); } @@ -1035,7 +1035,7 @@ void check_exports() { #endif if ((n % 2) == 0) { - x_chandle_t = nullptr; + x_chandle_t = NULL; x_string_t = "Bye"; } else { x_chandle_t = reinterpret_cast(&e_chandle_t); @@ -1044,10 +1044,10 @@ void check_exports() { e_chandle_t(&x_chandle_t); e_string_t(&x_string_t); if ((n % 2) == 0) { - if (x_chandle_t != nullptr) stop(); + if (x_chandle_t != NULL) stop(); if (strcmp(x_string_t, "World") != 0) stop(); } else { - if (x_chandle_t != nullptr) stop(); + if (x_chandle_t != NULL) stop(); if (strcmp(x_string_t, "Hello") != 0) stop(); } diff --git a/test_regress/t/t_dpi_arg_input_type.cpp b/test_regress/t/t_dpi_arg_input_type.cpp index cae552c2b..fe792ea45 100644 --- a/test_regress/t/t_dpi_arg_input_type.cpp +++ b/test_regress/t/t_dpi_arg_input_type.cpp @@ -145,7 +145,7 @@ void i_shortreal(float i) { void i_chandle(void* i) { static int n = 0; printf("i_chandle %d\n", n); - if (i != nullptr) stop(); + if (i) stop(); n++; } @@ -256,7 +256,7 @@ void i_shortreal_t(float i) { void i_chandle_t(void* i) { static int n = 0; printf("i_chandle_t %d\n", n); - if (i != nullptr) stop(); + if (i) stop(); n++; } @@ -618,7 +618,7 @@ void check_exports() { #ifndef NO_SHORTREAL e_shortreal(1.0f * n + 0.25f); #endif - e_chandle((n % 2) ? reinterpret_cast(&e_chandle) : nullptr); + e_chandle((n % 2) ? reinterpret_cast(&e_chandle) : NULL); e_string((n % 2) ? "World" : "Hello"); e_bit(n % 2); e_logic(!(n % 2)); @@ -645,7 +645,7 @@ void check_exports() { #ifndef NO_SHORTREAL e_shortreal_t(1.0f * (2 * n) + 0.25f); #endif - e_chandle_t((n % 2) ? nullptr : reinterpret_cast(&e_chandle_t)); + e_chandle_t((n % 2) ? NULL : reinterpret_cast(&e_chandle_t)); e_string_t((n % 2) ? "Hello" : "World"); e_bit_t(n % 2); e_logic_t(!(n % 2)); diff --git a/test_regress/t/t_dpi_arg_output_type.cpp b/test_regress/t/t_dpi_arg_output_type.cpp index af0bbc488..c257f53ff 100644 --- a/test_regress/t/t_dpi_arg_output_type.cpp +++ b/test_regress/t/t_dpi_arg_output_type.cpp @@ -131,7 +131,7 @@ void i_shortreal(float* o) { void i_chandle(void** o) { static int n = 0; printf("i_chandle %d\n", n); - *o = (n++ % 2) ? reinterpret_cast(&i_chandle) : nullptr; + *o = (n++ % 2) ? reinterpret_cast(&i_chandle) : NULL; } void i_string(const char** o) { @@ -247,7 +247,7 @@ void i_shortreal_t(float* o) { void i_chandle_t(void** o) { static int n = 0; printf("i_chandle_t %d\n", n); - *o = (n++ % 2) ? reinterpret_cast(&i_chandle) : nullptr; + *o = (n++ % 2) ? reinterpret_cast(&i_chandle) : NULL; } void i_string_t(const char** o) { @@ -707,7 +707,7 @@ void check_exports() { #endif e_chandle(&x_chandle); - if (x_chandle != nullptr) stop(); + if (x_chandle != NULL) stop(); e_string(&x_string); if ((n % 2) == 0) { @@ -768,7 +768,7 @@ void check_exports() { #endif e_chandle_t(&x_chandle_t); - if (x_chandle_t != nullptr) stop(); + if (x_chandle_t != NULL) stop(); e_string_t(&x_string_t); if ((n % 2) == 0) { diff --git a/test_regress/t/t_dpi_export_c.cpp b/test_regress/t/t_dpi_export_c.cpp index 6f2ed9011..297a6edc1 100644 --- a/test_regress/t/t_dpi_export_c.cpp +++ b/test_regress/t/t_dpi_export_c.cpp @@ -79,7 +79,7 @@ extern "C" { } #define CHECK_RESULT_NNULL(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = %p EXP = !nullptr\n", __FILE__, __LINE__, (got)); \ + printf("%%Error: %s:%d: GOT = %p EXP = !NULL\n", __FILE__, __LINE__, (got)); \ return __LINE__; \ } diff --git a/test_regress/t/t_dpi_qw_c.cpp b/test_regress/t/t_dpi_qw_c.cpp index 5db3dbe8f..802f87991 100644 --- a/test_regress/t/t_dpi_qw_c.cpp +++ b/test_regress/t/t_dpi_qw_c.cpp @@ -33,7 +33,7 @@ void poke_value(int i) { #endif svScope scope = svGetScopeFromName("top.t.a"); - if (scope == nullptr) { + if (scope == NULL) { printf("%%Error: null scope for top.t.a\n"); return; } diff --git a/test_regress/t/t_dpi_result_type.cpp b/test_regress/t/t_dpi_result_type.cpp index 1c0ff11ec..1ecbf0d94 100644 --- a/test_regress/t/t_dpi_result_type.cpp +++ b/test_regress/t/t_dpi_result_type.cpp @@ -108,7 +108,7 @@ float i_shortreal() { void* i_chandle() { static int n = 0; printf("i_chandle %d\n", n); - return (n++ % 2) ? reinterpret_cast(&i_chandle) : nullptr; + return (n++ % 2) ? reinterpret_cast(&i_chandle) : NULL; } const char* i_string() { @@ -205,7 +205,7 @@ float i_shortreal_t() { void* i_chandle_t() { static int n = 0; printf("i_chandle_t %d\n", n); - return (n++ % 2) ? reinterpret_cast(&i_chandle) : nullptr; + return (n++ % 2) ? reinterpret_cast(&i_chandle) : NULL; } const char* i_string_t() { @@ -299,7 +299,7 @@ void check_exports() { #ifndef NO_SHORTREAL if (e_shortreal() != 1.0f * n + 0.25f) stop(); #endif - if (e_chandle() != nullptr) stop(); + if (e_chandle()) stop(); if ((n % 2) == 0) { if (strcmp(e_string(), "Hello") != 0) stop(); } else { @@ -323,7 +323,7 @@ void check_exports() { #ifndef NO_SHORTREAL if (e_shortreal_t() != 1.0f * (2 * n) + 0.25f) stop(); #endif - if (e_chandle_t() != nullptr) stop(); + if (e_chandle_t()) stop(); if ((n % 2) == 0) { if (strcmp(e_string_t(), "Hello") != 0) stop(); } else { diff --git a/test_regress/t/t_dpi_var.cpp b/test_regress/t/t_dpi_var.cpp index bf6fc0658..dad42dcc1 100644 --- a/test_regress/t/t_dpi_var.cpp +++ b/test_regress/t/t_dpi_var.cpp @@ -20,8 +20,8 @@ struct MyMon { vluint32_t* sigsp[2]; MyMon() { - sigsp[0] = nullptr; - sigsp[1] = nullptr; + sigsp[0] = NULL; + sigsp[1] = NULL; } }; MyMon mons[2]; diff --git a/test_regress/t/t_scope_map.cpp b/test_regress/t/t_scope_map.cpp index 8f27bf268..90fd2c63f 100644 --- a/test_regress/t/t_scope_map.cpp +++ b/test_regress/t/t_scope_map.cpp @@ -43,7 +43,7 @@ int main(int argc, char** argv, char** env) { it->second->scopeDump(); #endif VerilatedVarNameMap* varNameMap = it->second->varsp(); - if (varNameMap == nullptr) { + if (!varNameMap) { VL_PRINTF("%%Error: Bad varsp()\n"); return -1; } @@ -118,7 +118,7 @@ int main(int argc, char** argv, char** env) { for (VerilatedScopeNameMap::const_iterator it = scopeMapp->begin(); it != scopeMapp->end(); ++it) { VerilatedVarNameMap* varNameMap = it->second->varsp(); - if (varNameMap == nullptr) { + if (!varNameMap) { VL_PRINTF("%%Error: Bad varsp()\n"); return -1; } diff --git a/test_regress/t/t_time_vpi_c.cpp b/test_regress/t/t_time_vpi_c.cpp index c693fd2f0..da3eb7f98 100644 --- a/test_regress/t/t_time_vpi_c.cpp +++ b/test_regress/t/t_time_vpi_c.cpp @@ -53,7 +53,7 @@ void show(vpiHandle obj) { void dpii_check() { show(0); - vpiHandle mod = vpi_handle_by_name((PLI_BYTE8*)"top.t", nullptr); + vpiHandle mod = vpi_handle_by_name((PLI_BYTE8*)"top.t", NULL); if (!mod) { vpi_printf(const_cast("-- Cannot vpi_find module\n")); } else { diff --git a/test_regress/t/t_tri_inout.cpp b/test_regress/t/t_tri_inout.cpp index a60dd6123..bd0cb1426 100644 --- a/test_regress/t/t_tri_inout.cpp +++ b/test_regress/t/t_tri_inout.cpp @@ -6,7 +6,7 @@ #include "Vt_tri_inout.h" -Vt_tri_inout* tb = nullptr; +VM_PREFIX* tb = nullptr; double sc_time_stamp() { return 0; } diff --git a/test_regress/t/t_tri_inz.cpp b/test_regress/t/t_tri_inz.cpp index d5b173b73..752274f44 100644 --- a/test_regress/t/t_tri_inz.cpp +++ b/test_regress/t/t_tri_inz.cpp @@ -5,7 +5,7 @@ #include "Vt_tri_inz.h" -Vt_tri_inz* tb = nullptr; +VM_PREFIX* tb = nullptr; bool pass = true; double sc_time_stamp() { return 0; } diff --git a/test_regress/t/t_tri_pullup.cpp b/test_regress/t/t_tri_pullup.cpp index bc7f901cf..7885093fd 100644 --- a/test_regress/t/t_tri_pullup.cpp +++ b/test_regress/t/t_tri_pullup.cpp @@ -6,7 +6,7 @@ #include "Vt_tri_pullup.h" -Vt_tri_pullup* tb = nullptr; +VM_PREFIX* tb = nullptr; double sc_time_stamp() { return 0; } diff --git a/test_regress/t/t_tri_select.cpp b/test_regress/t/t_tri_select.cpp index 083a0c668..d034b85f9 100644 --- a/test_regress/t/t_tri_select.cpp +++ b/test_regress/t/t_tri_select.cpp @@ -5,7 +5,7 @@ #include "Vt_tri_select.h" -Vt_tri_select* tb = nullptr; +VM_PREFIX* tb = nullptr; double sc_time_stamp() { return 0; } diff --git a/test_regress/t/t_vpi_get.cpp b/test_regress/t/t_vpi_get.cpp index 178c84c5b..9a18662f6 100644 --- a/test_regress/t/t_vpi_get.cpp +++ b/test_regress/t/t_vpi_get.cpp @@ -52,7 +52,7 @@ unsigned int main_time = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", FILENM, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", FILENM, __LINE__); \ return __LINE__; \ } @@ -168,7 +168,7 @@ int mon_check_props() { {"testout", {24, vpiOutput, 0, vpiPort}, {0, 0, 0, 0}}, {"sub.subin", {1, vpiInput, 1, vpiPort}, {0, 0, 0, 0}}, {"sub.subout", {1, vpiOutput, 1, vpiPort}, {0, 0, 0, 0}}, - {nullptr, {0, 0, 0, 0}, {0, 0, 0, 0}}}; + {NULL, {0, 0, 0, 0}, {0, 0, 0, 0}}}; struct params* value = values; while (value->signal) { TestVpiHandle h = VPI_HANDLE(value->signal); @@ -211,7 +211,7 @@ static int mon_check_vpi() { vpi_value.format = vpiIntVal; vpi_value.value.integer = mon_check(); - vpi_put_value(href, &vpi_value, nullptr, vpiNoDelay); + vpi_put_value(href, &vpi_value, NULL, vpiNoDelay); return 0; } diff --git a/test_regress/t/t_vpi_memory.cpp b/test_regress/t/t_vpi_memory.cpp index 01cf2a65c..60891c5a6 100644 --- a/test_regress/t/t_vpi_memory.cpp +++ b/test_regress/t/t_vpi_memory.cpp @@ -52,7 +52,7 @@ unsigned int main_time = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", FILENM, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", FILENM, __LINE__); \ return __LINE__; \ } @@ -116,7 +116,7 @@ int _mon_check_memory() { s_vpi_error_info e; vpi_printf((PLI_BYTE8*)"Check memory vpi ...\n"); - mem_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted("mem0"), nullptr); + mem_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted("mem0"), NULL); CHECK_RESULT_NZ(mem_h); // check type int vpitype = vpi_get(vpiType, mem_h); @@ -127,7 +127,7 @@ int _mon_check_memory() { cnt = 0; while ((lcl_h = vpi_scan(iter_h))) { value.value.integer = ++cnt; - vpi_put_value(lcl_h, &value, nullptr, vpiNoDelay); + vpi_put_value(lcl_h, &value, NULL, vpiNoDelay); // check size and range if (int status = _mon_check_range(lcl_h, 32, 31, 0)) return status; } @@ -176,7 +176,7 @@ int _mon_check_memory() { CHECK_RESULT(value.value.integer, 1); // check writing to vpiConstant - vpi_put_value(side_h, &value, nullptr, vpiNoDelay); + vpi_put_value(side_h, &value, NULL, vpiNoDelay); CHECK_RESULT_NZ(vpi_chk_error(&e)); return 0; // Ok @@ -198,7 +198,7 @@ static int mon_check_vpi() { vpi_value.format = vpiIntVal; vpi_value.value.integer = mon_check(); - vpi_put_value(href, &vpi_value, nullptr, vpiNoDelay); + vpi_put_value(href, &vpi_value, NULL, vpiNoDelay); return 0; } diff --git a/test_regress/t/t_vpi_module.cpp b/test_regress/t/t_vpi_module.cpp index 2283c55ca..abbb9fc8a 100644 --- a/test_regress/t/t_vpi_module.cpp +++ b/test_regress/t/t_vpi_module.cpp @@ -44,7 +44,7 @@ unsigned int main_time = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", FILENM, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", FILENM, __LINE__); \ return __LINE__; \ } @@ -57,7 +57,7 @@ unsigned int main_time = 0; extern "C" { int mon_check() { - vpiHandle it = vpi_iterate(vpiModule, nullptr); + vpiHandle it = vpi_iterate(vpiModule, NULL); CHECK_RESULT_NZ(it); vpiHandle topmod = vpi_scan(it); @@ -104,7 +104,7 @@ static int mon_check_vpi() { vpi_value.format = vpiIntVal; vpi_value.value.integer = mon_check(); - vpi_put_value(href, &vpi_value, nullptr, vpiNoDelay); + vpi_put_value(href, &vpi_value, NULL, vpiNoDelay); return 0; } diff --git a/test_regress/t/t_vpi_param.cpp b/test_regress/t/t_vpi_param.cpp index 108725ab6..f2b5f4e10 100644 --- a/test_regress/t/t_vpi_param.cpp +++ b/test_regress/t/t_vpi_param.cpp @@ -52,7 +52,7 @@ unsigned int main_time = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", FILENM, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", FILENM, __LINE__); \ return __LINE__; \ } @@ -91,7 +91,7 @@ int check_param_int(std::string name, PLI_INT32 format, int exp_value, bool verb const char* p; vpi_printf((PLI_BYTE8*)"Check parameter %s vpi ...\n", name.c_str()); - param_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted(name.c_str()), nullptr); + param_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted(name.c_str()), NULL); CHECK_RESULT_NZ(param_h); vpi_type = vpi_get(vpiType, param_h); CHECK_RESULT(vpi_type, vpiParameter); @@ -111,7 +111,7 @@ int check_param_int(std::string name, PLI_INT32 format, int exp_value, bool verb // values if (verbose) {vpi_printf((PLI_BYTE8*)" Try writing value to %s ...\n", name.c_str()); } value.value.integer = exp_value; - vpi_put_value(param_h, &value, nullptr, vpiNoDelay); + vpi_put_value(param_h, &value, NULL, vpiNoDelay); CHECK_RESULT_NZ(vpi_chk_error(&e)); if (verbose && vpi_chk_error(&e)) {vpi_printf((PLI_BYTE8*)" vpi_chk_error: %s\n", e.message); } @@ -135,7 +135,7 @@ int check_param_str(std::string name, PLI_INT32 format, std::string exp_value, b const char* p; vpi_printf((PLI_BYTE8*)"Check parameter %s vpi ...\n", name.c_str()); - param_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted(name.c_str()), nullptr); + param_h = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::rooted(name.c_str()), NULL); CHECK_RESULT_NZ(param_h); vpi_type = vpi_get(vpiType, param_h); CHECK_RESULT(vpi_type, vpiParameter); @@ -155,7 +155,7 @@ int check_param_str(std::string name, PLI_INT32 format, std::string exp_value, b // values if (verbose) {vpi_printf((PLI_BYTE8*)" Try writing value to %s ...\n", name.c_str()); } value.value.str = (PLI_BYTE8*) exp_value.c_str(); - vpi_put_value(param_h, &value, nullptr, vpiNoDelay); + vpi_put_value(param_h, &value, NULL, vpiNoDelay); CHECK_RESULT_NZ(vpi_chk_error(&e)); if (verbose && vpi_chk_error(&e)) {vpi_printf((PLI_BYTE8*)" vpi_chk_error: %s\n", e.message); } @@ -200,7 +200,7 @@ static int mon_check_vpi() { vpi_value.format = vpiIntVal; vpi_value.value.integer = mon_check(); - vpi_put_value(href, &vpi_value, nullptr, vpiNoDelay); + vpi_put_value(href, &vpi_value, NULL, vpiNoDelay); return 0; } diff --git a/test_regress/t/t_vpi_time_cb.cpp b/test_regress/t/t_vpi_time_cb.cpp index 39caa4513..110f0a160 100644 --- a/test_regress/t/t_vpi_time_cb.cpp +++ b/test_regress/t/t_vpi_time_cb.cpp @@ -53,7 +53,7 @@ unsigned int callback_count_start_of_sim = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", __FILE__, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", __FILE__, __LINE__); \ return __LINE__; \ } diff --git a/test_regress/t/t_vpi_unimpl.cpp b/test_regress/t/t_vpi_unimpl.cpp index e2bac0a88..63ce3f507 100644 --- a/test_regress/t/t_vpi_unimpl.cpp +++ b/test_regress/t/t_vpi_unimpl.cpp @@ -41,7 +41,7 @@ unsigned int callback_count = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", FILENM, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", FILENM, __LINE__); \ return __LINE__; \ } @@ -81,7 +81,7 @@ int _mon_check_unimpl(p_cb_data cb_data) { } else { // setup and install static t_cb_data cb_data; - clk_h = vpi_handle_by_name((PLI_BYTE8*)"t.clk", nullptr); + clk_h = vpi_handle_by_name((PLI_BYTE8*)"t.clk", NULL); cb_data.reason = cbPLIError; cb_data.cb_rtn = _mon_check_unimpl; // this function @@ -90,60 +90,60 @@ int _mon_check_unimpl(p_cb_data cb_data) { CHECK_RESULT_NZ(cb); // now exercise unimplemented fns - vpi_get_cb_info(cb, nullptr); + vpi_get_cb_info(cb, NULL); CHECK_RESULT(callback_count, 1); - vpi_register_systf(nullptr); + vpi_register_systf(NULL); CHECK_RESULT(callback_count, 2); - vpi_get_systf_info(nullptr, nullptr); + vpi_get_systf_info(NULL, NULL); CHECK_RESULT(callback_count, 3); - vpi_handle_multi(0, nullptr, nullptr); + vpi_handle_multi(0, NULL, NULL); CHECK_RESULT(callback_count, 4); - vpi_get64(0, nullptr); + vpi_get64(0, NULL); CHECK_RESULT(callback_count, 5); - vpi_get_delays(nullptr, nullptr); + vpi_get_delays(NULL, NULL); CHECK_RESULT(callback_count, 6); - vpi_put_delays(nullptr, nullptr); + vpi_put_delays(NULL, NULL); CHECK_RESULT(callback_count, 7); - vpi_get_value_array(nullptr, nullptr, nullptr, 0); + vpi_get_value_array(NULL, NULL, NULL, 0); CHECK_RESULT(callback_count, 8); - vpi_put_value_array(nullptr, nullptr, nullptr, 0); + vpi_put_value_array(NULL, NULL, NULL, 0); CHECK_RESULT(callback_count, 9); - vpi_get_time(nullptr, nullptr); + vpi_get_time(NULL, NULL); CHECK_RESULT(callback_count, 10); vpi_mcd_name(0); CHECK_RESULT(callback_count, 11); - vpi_compare_objects(nullptr, nullptr); + vpi_compare_objects(NULL, NULL); CHECK_RESULT(callback_count, 12); - vpi_get_data(0, nullptr, 0); + vpi_get_data(0, NULL, 0); CHECK_RESULT(callback_count, 13); - vpi_put_data(0, nullptr, 0); + vpi_put_data(0, NULL, 0); CHECK_RESULT(callback_count, 14); - vpi_get_userdata(nullptr); + vpi_get_userdata(NULL); CHECK_RESULT(callback_count, 15); - vpi_put_userdata(nullptr, nullptr); + vpi_put_userdata(NULL, NULL); CHECK_RESULT(callback_count, 16); - vpi_handle_by_multi_index(nullptr, 0, nullptr); + vpi_handle_by_multi_index(NULL, 0, NULL); CHECK_RESULT(callback_count, 17); vpi_control(0); CHECK_RESULT(callback_count, 18); s_vpi_time time_s; time_s.type = 0; - vpi_get_time(nullptr, &time_s); + vpi_get_time(NULL, &time_s); CHECK_RESULT(callback_count, 19); - handle = vpi_put_value(nullptr, nullptr, nullptr, 0); + handle = vpi_put_value(NULL, NULL, NULL, 0); CHECK_RESULT(callback_count, 20); CHECK_RESULT(handle, 0); - handle = vpi_handle(0, nullptr); + handle = vpi_handle(0, NULL); CHECK_RESULT(callback_count, 21); CHECK_RESULT(handle, 0); - vpi_iterate(0, nullptr); + vpi_iterate(0, NULL); CHECK_RESULT(callback_count, 22); - handle = vpi_register_cb(nullptr); + handle = vpi_register_cb(NULL); CHECK_RESULT(callback_count, 23); CHECK_RESULT(handle, 0); s_cb_data cb_data_s; @@ -157,7 +157,7 @@ int _mon_check_unimpl(p_cb_data cb_data) { int mon_check() { // Callback from initial block in monitor - if (int status = _mon_check_unimpl(nullptr)) return status; + if (int status = _mon_check_unimpl(NULL)) return status; return 0; // Ok } diff --git a/test_regress/t/t_vpi_var.cpp b/test_regress/t/t_vpi_var.cpp index 63b66efb4..0b067dab6 100644 --- a/test_regress/t/t_vpi_var.cpp +++ b/test_regress/t/t_vpi_var.cpp @@ -57,7 +57,7 @@ unsigned int callback_count_strs_max = 500; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", FILENM, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", FILENM, __LINE__); \ return __LINE__; \ } @@ -79,7 +79,7 @@ unsigned int callback_count_strs_max = 500; #define CHECK_RESULT_CSTR(got, exp) \ if (strcmp((got), (exp))) { \ printf("%%Error: %s:%d: GOT = '%s' EXP = '%s'\n", FILENM, __LINE__, \ - ((got) != nullptr) ? (got) : "", ((exp) != nullptr) ? (exp) : ""); \ + ((got) != NULL) ? (got) : "", ((exp) != NULL) ? (exp) : ""); \ return __LINE__; \ } @@ -129,8 +129,8 @@ int _mon_check_callbacks() { cb_data.reason = cbEndOfSimulation; cb_data.cb_rtn = _mon_check_callbacks_error; cb_data.user_data = 0; - cb_data.value = nullptr; - cb_data.time = nullptr; + cb_data.value = NULL; + cb_data.time = NULL; vpiHandle vh = vpi_register_cb(&cb_data); CHECK_RESULT_NZ(vh); @@ -184,7 +184,7 @@ int _mon_check_value_callbacks() { cb_data.cb_rtn = _value_callback; cb_data.obj = vh1; cb_data.value = &v; - cb_data.time = nullptr; + cb_data.time = NULL; vpiHandle vh = vpi_register_cb(&cb_data); CHECK_RESULT_NZ(vh); @@ -223,7 +223,7 @@ int _mon_check_var() { TestVpiHandle vh1 = VPI_HANDLE("onebit"); CHECK_RESULT_NZ(vh1); - TestVpiHandle vh2 = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::top(), nullptr); + TestVpiHandle vh2 = vpi_handle_by_name((PLI_BYTE8*)TestSimulator::top(), NULL); CHECK_RESULT_NZ(vh2); // scope attributes @@ -527,7 +527,7 @@ int _mon_check_putget_str(p_cb_data cb_data) { for (int i = 1; i <= 128; i++) { char buf[32]; snprintf(buf, sizeof(buf), TestSimulator::rooted("arr[%d].arr"), i); - CHECK_RESULT_NZ(data[i].scope = vpi_handle_by_name((PLI_BYTE8*)buf, nullptr)); + CHECK_RESULT_NZ(data[i].scope = vpi_handle_by_name((PLI_BYTE8*)buf, NULL)); CHECK_RESULT_NZ(data[i].sig = vpi_handle_by_name((PLI_BYTE8*)"sig", data[i].scope)); CHECK_RESULT_NZ(data[i].rfr = vpi_handle_by_name((PLI_BYTE8*)"rfr", data[i].scope)); CHECK_RESULT_NZ(data[i].check @@ -544,7 +544,7 @@ int _mon_check_putget_str(p_cb_data cb_data) { cb_data.cb_rtn = _mon_check_putget_str; // this function cb_data.obj = count_h; cb_data.value = &v; - cb_data.time = nullptr; + cb_data.time = NULL; v.format = vpiIntVal; cb = vpi_register_cb(&cb_data); @@ -578,7 +578,7 @@ int mon_check() { if (int status = _mon_check_getput()) return status; if (int status = _mon_check_quad()) return status; if (int status = _mon_check_string()) return status; - if (int status = _mon_check_putget_str(nullptr)) return status; + if (int status = _mon_check_putget_str(NULL)) return status; if (int status = _mon_check_vlog_info()) return status; #ifndef IS_VPI VerilatedVpi::selfTest(); @@ -596,7 +596,7 @@ static int mon_check_vpi() { vpi_value.format = vpiIntVal; vpi_value.value.integer = mon_check(); - vpi_put_value(href, &vpi_value, nullptr, vpiNoDelay); + vpi_put_value(href, &vpi_value, NULL, vpiNoDelay); return 0; } diff --git a/test_regress/t/t_vpi_zero_time_cb.cpp b/test_regress/t/t_vpi_zero_time_cb.cpp index b740cabc2..a553bec45 100644 --- a/test_regress/t/t_vpi_zero_time_cb.cpp +++ b/test_regress/t/t_vpi_zero_time_cb.cpp @@ -52,7 +52,7 @@ unsigned int callback_count_start_of_sim = 0; #define CHECK_RESULT_NZ(got) \ if (!(got)) { \ - printf("%%Error: %s:%d: GOT = nullptr EXP = !nullptr\n", __FILE__, __LINE__); \ + printf("%%Error: %s:%d: GOT = NULL EXP = !NULL\n", __FILE__, __LINE__); \ return __LINE__; \ }