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

Fix valgrind compile to work with new using std reorg

This commit is contained in:
Cary R 2021-11-10 18:18:52 -08:00
parent 12d67bb9ae
commit 56d69f498b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vvp/ufunc.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002-2016 Stephen Williams (steve@icarus.com) * Copyright (c) 2002-2021 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -371,7 +371,7 @@ void compile_ufunc_vec4(char*label, char*code, unsigned wid,
free(portv); free(portv);
} }
#ifdef CHECK_WITH_VALGRIND #ifdef CHECK_WITH_VALGRIND
static map<ufunc_core*, bool> ufunc_map; static std::map<ufunc_core*, bool> ufunc_map;
void exec_ufunc_delete(vvp_code_t euf_code) void exec_ufunc_delete(vvp_code_t euf_code)
{ {
@ -380,7 +380,7 @@ void exec_ufunc_delete(vvp_code_t euf_code)
void ufunc_pool_delete(void) void ufunc_pool_delete(void)
{ {
map<ufunc_core*, bool>::iterator iter; std::map<ufunc_core*, bool>::iterator iter;
for (iter = ufunc_map.begin(); iter != ufunc_map.end(); ++ iter ) { for (iter = ufunc_map.begin(); iter != ufunc_map.end(); ++ iter ) {
delete iter->first; delete iter->first;
} }

1
vvp/vpi_scope.cc
View File

@ -64,6 +64,7 @@ static void delete_sub_scopes(__vpiScope *scope)
case vpiFunction: case vpiFunction:
case vpiTask: case vpiTask:
contexts_delete(lscope); contexts_delete(lscope);
// fallthrough
case vpiModule: case vpiModule:
case vpiGenScope: case vpiGenScope:
case vpiNamedBegin: case vpiNamedBegin: