Merge branch 'master' of ssh://steve-icarus@icarus.com/~steve-icarus/git/verilog

This commit is contained in:
Stephen Williams 2009-09-24 19:09:27 -07:00
commit 91a16764e7
5 changed files with 9 additions and 10 deletions

View File

@ -203,6 +203,7 @@ ivl_signal_nex
ivl_signal_npath
ivl_signal_path
ivl_signal_port
ivl_signal_scope
ivl_signal_signed
ivl_signal_type
ivl_signal_width

View File

@ -737,7 +737,7 @@ bool crstring_test(const char*str)
if (tp == 0) return false;
if (tp[1] != 0) return false;
if ((strspn(str+3, "0123456789abcdefmg")+3) != (tp - str))
if ((strspn(str+3, "0123456789abcdefmg")+3) != (size_t)(tp - str))
return false;
return true;

View File

@ -196,9 +196,8 @@ vpiHandle vpip_make_real_var(const char*name, vvp_net_t*net)
void real_delete(vpiHandle item)
{
struct __vpiRealVar*obj = (struct __vpiRealVar*) item;
vvp_fun_signal_real*fun = (vvp_fun_signal_real*) obj->net->fun;
fun->clear_all_callbacks();
assert(obj->net->fil);
obj->net->fil->clear_all_callbacks();
free(obj);
}

View File

@ -939,9 +939,8 @@ static struct __vpiSignal* allocate_vpiSignal(void)
void signal_delete(vpiHandle item)
{
struct __vpiSignal *obj = (__vpiSignal *) item;
vvp_fun_signal_base*sig_fun;
sig_fun = (vvp_fun_signal_base*) obj->node->fun;
sig_fun->clear_all_callbacks();
assert(obj->node->fil);
obj->node->fil->clear_all_callbacks();
vvp_net_delete(obj->node);
VALGRIND_MEMPOOL_FREE(obj->pool, obj);
}
@ -1343,9 +1342,8 @@ void PV_delete(vpiHandle item)
break;
}
}
vvp_fun_signal_base*sig_fun;
sig_fun = (vvp_fun_signal_base*) obj->net->fun;
sig_fun->clear_all_callbacks();
assert(obj->net->fil);
obj->net->fil->clear_all_callbacks();
free(obj);
}
#endif

View File

@ -207,6 +207,7 @@ class __compile_net_resolv : public base_net_resolv {
{ msb_ = msb;
lsb_ = lsb;
signed_flag_ = signed_flag;
net8_flag_ = net8_flag;
}
~__compile_net_resolv() { }