luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compile with valgrind hooks after vec4-stack changes

This commit is contained in:
Cary R 2014-12-12 14:26:55 -08:00
parent 0282b8450c
commit 3ccc59eaa3
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
vvp/vpi_vthr_vector.cc
View File

@ -50,22 +50,6 @@ extern const char hex_digits[256];
extern const char oct_digits[64]; extern const char oct_digits[64];
#ifdef CHECK_WITH_VALGRIND
static map<vpiHandle, bool> handle_map;
void thread_vthr_delete(vpiHandle item)
{
handle_map[item] = true;
}
static void thread_vthr_delete_real(vpiHandle item)
{
struct __vpiVThrVec*obj = dynamic_cast<__vpiVThrVec*>(item);
delete obj;
}
#endif
struct __vpiVThrWord : public __vpiHandle { struct __vpiVThrWord : public __vpiHandle {
__vpiVThrWord(); __vpiVThrWord();
int get_type_code(void) const; int get_type_code(void) const;
@ -200,6 +184,8 @@ vpiHandle vpip_make_vthr_word(unsigned base, const char*type)
} }
#ifdef CHECK_WITH_VALGRIND #ifdef CHECK_WITH_VALGRIND
static map<vpiHandle, bool> handle_map;
void thread_word_delete(vpiHandle item) void thread_word_delete(vpiHandle item)
{ {
handle_map[item] = false; handle_map[item] = false;
@ -210,15 +196,6 @@ static void thread_word_delete_real(vpiHandle item)
struct __vpiVThrWord*obj = dynamic_cast<__vpiVThrWord*>(item); struct __vpiVThrWord*obj = dynamic_cast<__vpiVThrWord*>(item);
delete obj; delete obj;
} }
void vpi_handle_delete()
{
map<vpiHandle, bool>::iterator iter;
for (iter = handle_map.begin(); iter != handle_map.end(); ++ iter ) {
if (iter->second) thread_vthr_delete_real(iter->first);
else thread_word_delete_real(iter->first);
}
}
#endif #endif
class __vpiVThrStrStack : public __vpiHandle { class __vpiVThrStrStack : public __vpiHandle {
@ -547,6 +524,29 @@ vpiHandle __vpiVThrVec4Stack::vpi_put_value(p_vpi_value vp, int /*flags*/)
} }
} }
#ifdef CHECK_WITH_VALGRIND
void thread_vthr_delete(vpiHandle item)
{
handle_map[item] = true;
}
static void thread_vthr_delete_real(vpiHandle item)
{
class __vpiVThrVec4Stack*obj = dynamic_cast<__vpiVThrVec4Stack*>(item);
delete obj;
}
void vpi_handle_delete()
{
map<vpiHandle, bool>::iterator iter;
for (iter = handle_map.begin(); iter != handle_map.end(); ++ iter ) {
if (iter->second) thread_vthr_delete_real(iter->first);
else thread_word_delete_real(iter->first);
}
}
#endif
vpiHandle vpip_make_vthr_str_stack(unsigned depth) vpiHandle vpip_make_vthr_str_stack(unsigned depth)
{ {
class __vpiVThrStrStack*obj = new __vpiVThrStrStack(depth); class __vpiVThrStrStack*obj = new __vpiVThrStrStack(depth);