Mario1159/verilator
1
0
Fork 0
forked from github/verilator
Code Pull Requests Releases 1 Activity

Tests: Avoid using std. No functional change.

Browse Source
This commit is contained in:
Wilson Snyder 2020-06-10 08:04:34 -04:00
parent a7edf13d62
commit 262ed9c03a
9 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_regress/t/TestSimulator.h
View File

@ -67,8 +67,8 @@ public:
}
// return absolute scope of obj
static const char* rooted(const char* obj) {
static string buf;
ostringstream os;
static std::string buf;
std::ostringstream os;
os<<top()<<"."<<obj;
buf = os.str();
return buf.c_str();

2
test_regress/t/t_scope_map.cpp
View File

@ -14,8 +14,6 @@
#include "Vt_scope_map.h"
using namespace std;
unsigned long long main_time = 0;
double sc_time_stamp() { return (double)main_time; }

5
test_regress/t/t_timescale.cpp
View File

@ -11,14 +11,13 @@ unsigned long long main_time = 0;
double sc_time_stamp() { return (double)main_time; }
#include <iostream>
using namespace std;
#define FILENM "t_timescale.cpp"
#define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << std::endl; \
return __LINE__; \
}

9
test_regress/t/t_vpi_get.cpp
View File

@ -30,7 +30,6 @@
#include <cstdio>
#include <cstring>
#include <iostream>
using namespace std;
#include "TestSimulator.h"
#include "TestVpi.h"
@ -60,15 +59,15 @@ unsigned int main_time = 0;
// Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << hex << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << std::hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << endl; \
return __LINE__; \
}

9
test_regress/t/t_vpi_memory.cpp
View File

@ -30,7 +30,6 @@
#include <cstdio>
#include <cstring>
#include <iostream>
using namespace std;
#include "TestSimulator.h"
#include "TestVpi.h"
@ -60,15 +59,15 @@ unsigned int main_time = 0;
// Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << hex << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << std::hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << std::endl; \
return __LINE__; \
}

1
test_regress/t/t_vpi_module.cpp
View File

@ -30,7 +30,6 @@
#include <cstdio>
#include <cstring>
#include <iostream>
using namespace std;
#include "TestSimulator.h"
#include "TestVpi.h"

11
test_regress/t/t_vpi_time_cb.cpp
View File

@ -31,7 +31,6 @@
#include <cstdio>
#include <cstring>
#include <iostream>
using namespace std;
#include "TestSimulator.h"
#include "TestVpi.h"
@ -61,15 +60,15 @@ unsigned int callback_count_start_of_sim = 0;
// Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << __FILE__ << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << __FILE__ << ":" << __LINE__ << hex << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
@ -218,7 +217,7 @@ int main(int argc, char** argv, char** env) {
void* lib = dlopen(filenamep, RTLD_LAZY);
void* bootstrap = dlsym(lib, "vpi_compat_bootstrap");
if (!bootstrap) {
string msg = string("%Error: Could not dlopen ") + filenamep;
std::string msg = std::string("%Error: Could not dlopen ") + filenamep;
vl_fatal(__FILE__, __LINE__, "main", msg.c_str());
}
((void (*)(void))bootstrap)();

9
test_regress/t/t_vpi_var.cpp
View File

@ -30,7 +30,6 @@
#include <cstdio>
#include <cstring>
#include <iostream>
using namespace std;
#include "TestSimulator.h"
#include "TestVpi.h"
@ -65,15 +64,15 @@ unsigned int callback_count_strs_max = 500;
// Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << FILENM << ":" << __LINE__ << hex << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << FILENM << ":" << __LINE__ << std::hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << std::endl; \
return __LINE__; \
}

11
test_regress/t/t_vpi_zero_time_cb.cpp
View File

@ -31,7 +31,6 @@
#include <cstdio>
#include <cstring>
#include <iostream>
using namespace std;
#include "TestSimulator.h"
#include "TestVpi.h"
@ -60,15 +59,15 @@ unsigned int callback_count_start_of_sim = 0;
// Use cout to avoid issues with %d/%lx etc
#define CHECK_RESULT(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << __FILE__ << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << ": GOT = " << (got) \
<< " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
#define CHECK_RESULT_HEX(got, exp) \
if ((got) != (exp)) { \
cout << dec << "%Error: " << __FILE__ << ":" << __LINE__ << hex << ": GOT = " << (got) \
<< " EXP = " << (exp) << endl; \
std::cout << std::dec << "%Error: " << __FILE__ << ":" << __LINE__ << hex \
<< ": GOT = " << (got) << " EXP = " << (exp) << std::endl; \
return __LINE__; \
}
@ -168,7 +167,7 @@ int main(int argc, char** argv, char** env) {
void* lib = dlopen(filenamep, RTLD_LAZY);
void* bootstrap = dlsym(lib, "vpi_compat_bootstrap");
if (!bootstrap) {
string msg = string("%Error: Could not dlopen ") + filenamep;
std::string msg = std::string("%Error: Could not dlopen ") + filenamep;
vl_fatal(__FILE__, __LINE__, "main", msg.c_str());
}
((void (*)(void))bootstrap)();