luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XSPICE delay: add some more safeguards

This commit is contained in:
Holger Vogt 2021-07-27 11:45:38 +02:00
parent 05624bedd3
commit 6aac403ab0
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/xspice/icm/analog/delay/cfunc.mod
View File

@ -170,7 +170,7 @@ static void cm_delay_callback(ARGS, Mif_Callback_Reason_t reason);
void cm_delay(ARGS) void cm_delay(ARGS)
{ {
int buffer_size, delay_step; int buffer_size, delay_step;
double delay; double delay, lcntrl;
double delmin, delmax; double delmin, delmax;
mLocal_Data_t *loc; /* Pointer to local static data, not to be included mLocal_Data_t *loc; /* Pointer to local static data, not to be included
@ -252,6 +252,10 @@ void cm_delay(ARGS)
cm_message_send("max delay greater than final sim time not allowed, set to final time"); cm_message_send("max delay greater than final sim time not allowed, set to final time");
} }
} }
if (loc->tdelmax < loc->tdelmin) {
loc->tdelmax = loc->tdelmin;
cm_message_send("max delay smaller than min delay, set to min delay");
}
} }
loc->buff_write = 0; loc->buff_write = 0;
@ -294,8 +298,14 @@ void cm_delay(ARGS)
delmin = loc->tdelmin; delmin = loc->tdelmin;
delmax = loc->tdelmax; delmax = loc->tdelmax;
lcntrl = INPUT(cntrl);
if (lcntrl < 0)
lcntrl = 0.;
else if (lcntrl > 1.)
lcntrl = 1.;
if (PARAM(has_delay_cnt) == MIF_TRUE) { if (PARAM(has_delay_cnt) == MIF_TRUE) {
delay = (delmax - delmin) * INPUT(cntrl) + delmin; delay = (delmax - delmin) * lcntrl + delmin;
} }
/* time not yet advanced for delay output */ /* time not yet advanced for delay output */