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

For a delayed vpi_put_value() copy any pointer data members. 

When vpi_put_value() is asked to delay the assignment any pointer data
needs to be duplicated so that the caller can clean up the locally
allocated memory without causing memory access problems.

Also update word calculation to match the next patch.
This commit is contained in:
Cary R 2012-04-01 12:27:28 -07:00
parent 327194cd40
commit b85e7efca8
1 changed files with 57 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
vvp/vpi_priv.cc
View File

@ -690,7 +690,7 @@ void vpip_vec4_get_value(const vvp_vector4_t&word_val, unsigned width,
vp->format = vpiVectorVal;
case vpiVectorVal: {
unsigned hwid = (width - 1)/32 + 1;
unsigned hwid = (width + 31)/32;
rbuf = need_result_buf(hwid * sizeof(s_vpi_vecval), RBUF_VAL);
s_vpi_vecval *op = (p_vpi_vecval)rbuf;
@ -755,7 +755,7 @@ void vpip_vec2_get_value(const vvp_vector2_t&word_val, unsigned width,
break;
case vpiVectorVal: {
unsigned hwid = (width - 1)/32 + 1;
unsigned hwid = (width + 31)/32;
rbuf = need_result_buf(hwid * sizeof(s_vpi_vecval), RBUF_VAL);
s_vpi_vecval *op = (p_vpi_vecval)rbuf;
@ -948,15 +948,54 @@ void vpip_put_value_event::run_run()
case vpiStringVal:
free(value.value.str);
break;
/* If these are ever copied then free them too. */
/* Free the copied time structure. */
case vpiTimeVal:
free(value.value.time);
break;
/* Free the copied vector structure. */
case vpiVectorVal:
free(value.value.vector);
break;
/* Free the copied strength structure. */
case vpiStrengthVal:
free(value.value.strength);
break;
/* Everything else is static in the structure. */
default:
break;
}
}
/* Make a copy of a pointer to a time structure. */
static t_vpi_time *timedup(t_vpi_time *val)
{
t_vpi_time *rtn;
rtn = (t_vpi_time *) malloc(sizeof(t_vpi_time));
*rtn = *val;
return rtn;
}
/* Make a copy of a pointer to a vector value structure. */
static t_vpi_vecval *vectordup(t_vpi_vecval *val, PLI_INT32 size)
{
unsigned num_bytes;
t_vpi_vecval *rtn;
assert(size > 0);
num_bytes = ((size + 31)/32)*sizeof(t_vpi_vecval);
rtn = (t_vpi_vecval *) malloc(num_bytes);
memcpy(rtn, val, num_bytes);
return rtn;
}
/* Make a copy of a pointer to a strength structure. */
static t_vpi_strengthval *strengthdup(t_vpi_strengthval *val)
{
t_vpi_strengthval *rtn;
rtn = (t_vpi_strengthval *) malloc(sizeof(t_vpi_strengthval));
*rtn = *val;
return rtn;
}
vpiHandle vpi_put_value(vpiHandle obj, s_vpi_value*vp,
s_vpi_time*when, PLI_INT32 flags)
{
@ -999,8 +1038,10 @@ vpiHandle vpi_put_value(vpiHandle obj, s_vpi_value*vp,
vpip_put_value_event*put = new vpip_put_value_event;
put->handle = obj;
put->value = *vp;
/* Since this is a scheduled put event we must copy any pointer
* data to keep it available until the event is actually run. */
switch (put->value.format) {
/* If this is scheduled make a copy of the string. */
/* Copy the string items. */
case vpiBinStrVal:
case vpiOctStrVal:
case vpiDecStrVal:
@ -1008,10 +1049,21 @@ vpiHandle vpi_put_value(vpiHandle obj, s_vpi_value*vp,
case vpiStringVal:
put->value.value.str = strdup(put->value.value.str);
break;
/* Do these also need to be copied? */
/* Copy a time pointer item. */
case vpiTimeVal:
put->value.value.time = timedup(put->value.value.time);
break;
/* Copy a vector pointer item. */
case vpiVectorVal:
put->value.value.vector = vectordup(put->value.value.vector,
vpi_get(vpiSize, obj));
break;
/* Copy a strength pointer item. */
case vpiStrengthVal:
put->value.value.strength =
strengthdup(put->value.value.strength);
break;
/* Everything thing else is already in the structure. */
default:
break;
}