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

vvp: Allocate time structures for cbNextSimTime and cbEndOfSimulation. 

Previously they were reusing the pointer supplied when the callback
was registered, which is not guaranteed to still be valid.

Note that the IEEE standard states:

    The only fields in the s_cb_data structure that shall need to
    be set up for simulation action or feature callbacks are the
    reason, cb_rtn, and user_data (if desired) fields.

so for cbEndOfSimulation callbacks we cannot rely on the time pointer
being either valid or null. The standard does not require that the
time structure should be filled in when the callback occurs, but for
backwards compatibility continue to do so, returning a vpiSimTime
value.
This commit is contained in:
Martin Whitaker 2024-02-05 09:21:01 +00:00
parent d364c5e903
commit c0e9b73d1c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vvp/vpi_callback.cc
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2001-2022 Stephen Williams (steve@icarus.com)
* Copyright (c) 2001-2024 Stephen Williams (steve@icarus.com)
*
* This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU
@ -461,12 +461,25 @@ static struct __vpiCallback* make_at_end_of_sim_time(p_cb_data data)
class simulator_callback : public __vpiCallback {
public:
inline explicit simulator_callback(const struct t_cb_data*data)
{ cb_data = *data; }
explicit simulator_callback(const struct t_cb_data*data);
public:
struct t_vpi_time cb_time;
};
inline simulator_callback::simulator_callback(const struct t_cb_data*data)
{
cb_data = *data;
if ((data->reason == cbNextSimTime) && data->time) {
cb_time = *(data->time);
} else if (data->reason == cbEndOfSimulation) {
cb_time.type = vpiSimTime;
} else {
cb_time.type = vpiSuppressTime;
}
cb_data.time = &cb_time;
}
static simulator_callback*NextSimTime = 0;
static simulator_callback*EndOfCompile = 0;
static simulator_callback*StartOfSimulation = 0;
@ -559,9 +572,8 @@ void vpiPostsim(void) {
cur = EndOfSimulation;
EndOfSimulation = dynamic_cast<simulator_callback*>(cur->next);
if (cur->cb_data.cb_rtn != 0) {
/* Only set the time if it is not NULL. */
if (cur->cb_data.time)
vpip_time_to_timestruct(cur->cb_data.time, schedule_simtime());
assert(cur->cb_data.time);
vpip_time_to_timestruct(cur->cb_data.time, schedule_simtime());
(cur->cb_data.cb_rtn)(&cur->cb_data);
}
delete cur;