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

Add unlink from driver to deassign and zero link pointer. 

This patch fixes deassign to allow it to unlink from a driver.
It also zeros the cassign_link and force_link pointers after
they have been unlinked. Not doing this will cause an assert
if deassign/release are called multiple times (variable only).
This commit is contained in:
Cary R 2008-04-16 18:52:42 -07:00 committed by Stephen Williams
parent 844447b995
commit 54918cf5b9
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vvp/vthread.cc
View File

@ -802,7 +802,7 @@ bool of_CASSIGN_LINK(vthread_t thr, vvp_code_t cp)
/* If there is an existing cassign driving this node, then /* If there is an existing cassign driving this node, then
unlink it. We can have only 1 cassign at a time. */ unlink it. We can have only 1 cassign at a time. */
if (sig->cassign_link != 0) { if (sig->cassign_link != 0) {
vvp_net_ptr_t tmp (dst,1); vvp_net_ptr_t tmp (dst, 1);
unlink_from_driver(sig->cassign_link, tmp); unlink_from_driver(sig->cassign_link, tmp);
} }
@ -1225,8 +1225,6 @@ bool of_CVT_VR(vthread_t thr, vvp_code_t cp)
* This implements the %deassign instruction. All we do is write a * This implements the %deassign instruction. All we do is write a
* long(1) to port-3 of the addressed net. This turns off an active * long(1) to port-3 of the addressed net. This turns off an active
* continuous assign activated by %cassign/v * continuous assign activated by %cassign/v
*
* FIXME: This does not remove a linked %cassign/link. It should.
*/ */
bool of_DEASSIGN(vthread_t thr, vvp_code_t cp) bool of_DEASSIGN(vthread_t thr, vvp_code_t cp)
{ {
@ -1242,6 +1240,19 @@ bool of_DEASSIGN(vthread_t thr, vvp_code_t cp)
bool full_sig = base == 0 && width == sig->size(); bool full_sig = base == 0 && width == sig->size();
// This is the net that is forcing me...
if (vvp_net_t*src = sig->cassign_link) {
if (!full_sig) {
fprintf(stderr, "Sorry: when a signal is assigning a "
"register, I cannot deassign part of it.\n");
exit(1);
}
// And this is the pointer to be removed.
vvp_net_ptr_t dst_ptr (net, 1);
unlink_from_driver(src, dst_ptr);
sig->cassign_link = 0;
}
/* Do we release all or part of the net? */ /* Do we release all or part of the net? */
vvp_net_ptr_t ptr (net, 3); vvp_net_ptr_t ptr (net, 3);
if (full_sig) { if (full_sig) {
@ -1260,6 +1271,14 @@ bool of_DEASSIGN_WR(vthread_t thr, vvp_code_t cp)
vvp_fun_signal_real*sig = reinterpret_cast<vvp_fun_signal_real*>(net->fun); vvp_fun_signal_real*sig = reinterpret_cast<vvp_fun_signal_real*>(net->fun);
assert(sig); assert(sig);
// This is the net that is forcing me...
if (vvp_net_t*src = sig->cassign_link) {
// And this is the pointer to be removed.
vvp_net_ptr_t dst_ptr (net, 1);
unlink_from_driver(src, dst_ptr);
sig->cassign_link = 0;
}
vvp_net_ptr_t ptr (net, 3); vvp_net_ptr_t ptr (net, 3);
vvp_send_long(ptr, 1); vvp_send_long(ptr, 1);
@ -3405,6 +3424,7 @@ bool of_RELEASE_REG(vthread_t thr, vvp_code_t cp)
// And this is the pointer to be removed. // And this is the pointer to be removed.
vvp_net_ptr_t dst_ptr (net, 2); vvp_net_ptr_t dst_ptr (net, 2);
unlink_from_driver(src, dst_ptr); unlink_from_driver(src, dst_ptr);
sig->force_link = 0;
} }
// Send a command to this signal to unforce itself. // Send a command to this signal to unforce itself.
@ -3433,6 +3453,7 @@ bool of_RELEASE_WR(vthread_t thr, vvp_code_t cp)
// And this is the pointer to be removed. // And this is the pointer to be removed.
vvp_net_ptr_t dst_ptr (net, 2); vvp_net_ptr_t dst_ptr (net, 2);
unlink_from_driver(src, dst_ptr); unlink_from_driver(src, dst_ptr);
sig->force_link = 0;
} }
// Send a command to this signal to unforce itself. // Send a command to this signal to unforce itself.