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

Add inertial delay to missed d_xnor and tidy blank lines in d_xor.

This commit is contained in:
Giles Atkinson 2023-03-17 15:21:18 +00:00 committed by Holger Vogt
parent f91b5d6637
commit d3ce882ce7
3 changed files with 153 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
src/xspice/icm/digital/d_xnor/cfunc.mod
View File

@ -9,24 +9,20 @@ Georgia Tech Research Corporation
Atlanta, Georgia 30332 Atlanta, Georgia 30332
PROJECT A-8503-405 PROJECT A-8503-405
AUTHORS AUTHORS
18 Jun 1991 Jeffrey P. Murray 18 Jun 1991 Jeffrey P. Murray
MODIFICATIONS MODIFICATIONS
7 Aug 1991 Jeffrey P. Murray 7 Aug 1991 Jeffrey P. Murray
2 Oct 1991 Jeffrey P. Murray 2 Oct 1991 Jeffrey P. Murray
SUMMARY SUMMARY
This file contains the model-specific routines used to This file contains the model-specific routines used to
functionally describe the d_xnor code model. functionally describe the d_xnor code model.
INTERFACES INTERFACES
FILE ROUTINE CALLED FILE ROUTINE CALLED
@ -36,13 +32,10 @@ INTERFACES
CMevt.c void *cm_event_alloc() CMevt.c void *cm_event_alloc()
void *cm_event_get_ptr() void *cm_event_get_ptr()
REFERENCED FILES REFERENCED FILES
Inputs from and outputs to ARGS structure. Inputs from and outputs to ARGS structure.
NON-STANDARD FEATURES NON-STANDARD FEATURES
NONE NONE
@ -51,70 +44,53 @@ NON-STANDARD FEATURES
/*=== INCLUDE FILES ====================*/ /*=== INCLUDE FILES ====================*/
#include "ngspice/inertial.h"
/*=== CONSTANTS ========================*/ /*=== CONSTANTS ========================*/
/*=== MACROS ===========================*/ /*=== MACROS ===========================*/
/*=== LOCAL VARIABLES & TYPEDEFS =======*/ /*=== LOCAL VARIABLES & TYPEDEFS =======*/
/*=== FUNCTION PROTOTYPE DEFINITIONS ===*/ /*=== FUNCTION PROTOTYPE DEFINITIONS ===*/
/*============================================================================== /*==============================================================================
FUNCTION cm_toggle_bit() FUNCTION cm_toggle_bit()
AUTHORS AUTHORS
27 Sept 1991 Jeffrey P. Murray 27 Sept 1991 Jeffrey P. Murray
MODIFICATIONS MODIFICATIONS
NONE NONE
SUMMARY SUMMARY
Alters the state of a passed digital variable to its Alters the state of a passed digital variable to its
complement. Thus, a ONE changes to a ZERO. A ZERO changes complement. Thus, a ONE changes to a ZERO. A ZERO changes
to a ONE, and an UNKNOWN remains unchanged. to a ONE, and an UNKNOWN remains unchanged.
INTERFACES INTERFACES
FILE ROUTINE CALLED FILE ROUTINE CALLED
N/A N/A N/A N/A
RETURNED VALUE RETURNED VALUE
No returned value. Passed pointer to variable is used No returned value. Passed pointer to variable is used
to redefine the variable value. to redefine the variable value.
GLOBAL VARIABLES GLOBAL VARIABLES
NONE NONE
NON-STANDARD FEATURES NON-STANDARD FEATURES
NONE NONE
@ -124,7 +100,6 @@ NON-STANDARD FEATURES
/*=== CM_TOGGLE_BIT ROUTINE ===*/ /*=== CM_TOGGLE_BIT ROUTINE ===*/
static void cm_toggle_bit(Digital_State_t *bit) static void cm_toggle_bit(Digital_State_t *bit)
{ {
/* Toggle bit from ONE to ZERO or vice versa, unless the /* Toggle bit from ONE to ZERO or vice versa, unless the
bit value is UNKNOWN. In the latter case, return bit value is UNKNOWN. In the latter case, return
@ -138,7 +113,6 @@ static void cm_toggle_bit(Digital_State_t *bit)
*bit = ONE; *bit = ONE;
} }
} }
} }
@ -146,23 +120,19 @@ static void cm_toggle_bit(Digital_State_t *bit)
FUNCTION cm_d_xnor() FUNCTION cm_d_xnor()
AUTHORS AUTHORS
18 Jun 1991 Jeffrey P. Murray 18 Jun 1991 Jeffrey P. Murray
MODIFICATIONS MODIFICATIONS
7 Aug 1991 Jeffrey P. Murray 7 Aug 1991 Jeffrey P. Murray
2 Oct 1991 Jeffrey P. Murray 2 Oct 1991 Jeffrey P. Murray
SUMMARY SUMMARY
This function implements the d_xnor code model. This function implements the d_xnor code model.
INTERFACES INTERFACES
FILE ROUTINE CALLED FILE ROUTINE CALLED
@ -172,17 +142,14 @@ INTERFACES
CMevt.c void *cm_event_alloc() CMevt.c void *cm_event_alloc()
void *cm_event_get_ptr() void *cm_event_get_ptr()
RETURNED VALUE RETURNED VALUE
Returns inputs and outputs via ARGS structure. Returns inputs and outputs via ARGS structure.
GLOBAL VARIABLES GLOBAL VARIABLES
NONE NONE
NON-STANDARD FEATURES NON-STANDARD FEATURES
NONE NONE
@ -199,126 +166,129 @@ NON-STANDARD FEATURES
* Created 6/18/91 J.P.Murray * * Created 6/18/91 J.P.Murray *
************************************************/ ************************************************/
void cm_d_xnor(ARGS) void cm_d_xnor(ARGS)
{ {
int i, /* generic loop counter index */ int i, /* generic loop counter index */
size; /* number of input & output ports */ size; /* number of input & output ports */
Digital_State_t *out, /* temporary output for buffers */ Digital_State_t val,
*out_old, /* previous output for buffers */ *out, /* temporary output for buffers */
input; /* temp storage for input bits */ input; /* temp storage for input bits */
/** Retrieve size value... **/ /** Retrieve size value... **/
size = PORT_SIZE(in); size = PORT_SIZE(in);
/*** Setup required state variables ***/ /*** Setup required state variables ***/
if(INIT) { /* initial pass */ if(INIT) { /* initial pass */
/* allocate storage for the outputs */ /* allocate storage for the outputs */
cm_event_alloc(0,sizeof(Digital_State_t));
cm_event_alloc(0, sizeof (Digital_State_t));
/* Inertial delay? */
STATIC_VAR(is_inertial) =
cm_is_inertial(PARAM_NULL(inertial_delay) ? Not_set :
PARAM(inertial_delay));
if (STATIC_VAR(is_inertial)) {
/* Allocate storage for event time. */
cm_event_alloc(1, sizeof (struct idata));
((struct idata *)cm_event_get_ptr(1, 0))->when = -1.0;
}
/* Prepare initial output. */
out = (Digital_State_t *)cm_event_get_ptr(0, 0);
*out = (Digital_State_t)(UNKNOWN + 1); // Force initial output.
for (i=0; i<size; i++) LOAD(in[i]) = PARAM(input_load); for (i=0; i<size; i++) LOAD(in[i]) = PARAM(input_load);
} else { /* Retrieve previous values */
/* retrieve storage for the outputs */ /* retrieve storage for the outputs */
out = out_old = (Digital_State_t *) cm_event_get_ptr(0,0);
}
else { /* Retrieve previous values */
/* retrieve storage for the outputs */
out = (Digital_State_t *) cm_event_get_ptr(0,0); out = (Digital_State_t *) cm_event_get_ptr(0,0);
out_old = (Digital_State_t *) cm_event_get_ptr(0,1);
} }
/*** Calculate new output value based on inputs ***/ /*** Calculate new output value based on inputs ***/
*out = ONE; val = ONE;
for (i=0; i<size; i++) { for (i=0; i<size; i++) {
/* if a 1, toggle bit value */
/* make sure this input isn't floating... */ if ( ONE == (input = INPUT_STATE(in[i])) ) {
if ( FALSE == PORT_NULL(in) ) { cm_toggle_bit(&val);
} else {
/* if a 1, toggle bit value */ /* if an unknown input, set val to unknown & break */
if ( ONE == (input = INPUT_STATE(in[i])) ) { if ( UNKNOWN == input ) {
cm_toggle_bit(out); val = UNKNOWN;
break;
} }
else {
/* if an unknown input, set *out to unknown & break */
if ( UNKNOWN == input ) {
*out = UNKNOWN;
break;
}
}
}
else {
/* at least one port is floating...output is unknown */
*out = UNKNOWN;
break;
} }
} }
/*** Check for change and output appropriate values ***/
if (val == *out) { /* output value is not changing */
/*** Determine analysis type and output appropriate values ***/ OUTPUT_CHANGED(out) = FALSE;
} else {
if (ANALYSIS == DC) { /** DC analysis...output w/o delays **/ switch (val) {
OUTPUT_STATE(out) = *out;
}
else { /** Transient Analysis **/
if ( *out != *out_old ) { /* output value is changing */
switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = ZERO; case 0:
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = ONE; case 1:
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;
/* unknown output */ /* unknown output */
default: default:
OUTPUT_STATE(out) = *out = UNKNOWN; /* based on old value, add rise or fall delay */
if (0 == *out) { /* add rising delay */
OUTPUT_DELAY(out) = PARAM(rise_delay);
} else { /* add falling delay */
OUTPUT_DELAY(out) = PARAM(fall_delay);
}
break;
}
/* based on old value, add rise or fall delay */ if (STATIC_VAR(is_inertial) && ANALYSIS == TRANSIENT) {
if (0 == *out_old) { /* add rising delay */ struct idata *idp;
idp = (struct idata *)cm_event_get_ptr(1, 0);
if (idp->when <= TIME) {
/* Normal transition. */
idp->prev = *out;
idp->when = TIME + OUTPUT_DELAY(out); // Actual output time
} else if (val != idp->prev) {
Digital_t ov = {idp->prev, STRONG};
/* Third value: cancel earlier change and output as usual. */
cm_schedule_output(1, 0, (idp->when - TIME) / 2.0, &ov);
if (val == UNKNOWN) {
/* Delay based in idp->prev, not *out. */
if (idp->prev == ZERO)
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
} else
else { /* add falling delay */
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
} }
break; idp->when = TIME + OUTPUT_DELAY(out); // Actual output time
} else {
/* Changing back: override pending change. */
OUTPUT_DELAY(out) = (idp->when - TIME) / 2.0; // Override
idp->when = -1.0;
} }
} }
else { /* output value not changing */ *out = val;
OUTPUT_CHANGED(out) = FALSE; OUTPUT_STATE(out) = val;
} OUTPUT_STRENGTH(out) = STRONG;
} }
OUTPUT_STRENGTH(out) = STRONG;
} }

36
src/xspice/icm/digital/d_xnor/ifspec.ifs
View File

@ -33,8 +33,8 @@ Description: "input" "output"
Direction: in out Direction: in out
Default_Type: d d Default_Type: d d
Allowed_Types: [d] [d] Allowed_Types: [d] [d]
Vector: yes no Vector: yes no
Vector_Bounds: [2 -] - Vector_Bounds: [2 -] -
Null_Allowed: no no Null_Allowed: no no
@ -52,12 +52,30 @@ Null_Allowed: yes yes
PARAMETER_TABLE: PARAMETER_TABLE:
Parameter_Name: input_load Parameter_Name: input_load family
Description: "input load value (pF)" Description: "input load value (F)" "Logic family for bridging"
Data_Type: real Data_Type: real string
Default_Value: 1.0 Default_Value: 1.0e-12 -
Limits: [0.0 -] Limits: - -
Vector: no Vector: no no
Vector_Bounds: - Vector_Bounds: - -
Null_Allowed: yes yes
PARAMETER_TABLE:
Parameter_Name: inertial_delay
Description: "swallow short pulses"
Data_Type: boolean
Default_Value: false
Limits: -
Vector: no
Vector_Bounds: -
Null_Allowed: yes Null_Allowed: yes
STATIC_VAR_TABLE:
Static_Var_Name: is_inertial
Data_Type: boolean
Description: "using inertial delay"

7
src/xspice/icm/digital/d_xor/cfunc.mod
View File

@ -157,9 +157,7 @@ NON-STANDARD FEATURES
* Created 6/18/91 J.P.Murray * * Created 6/18/91 J.P.Murray *
************************************************/ ************************************************/
void cm_d_xor(ARGS) void cm_d_xor(ARGS)
{ {
int i, /* generic loop counter index */ int i, /* generic loop counter index */
size; /* number of input & output ports */ size; /* number of input & output ports */
@ -285,8 +283,3 @@ void cm_d_xor(ARGS)
OUTPUT_STRENGTH(out) = STRONG; OUTPUT_STRENGTH(out) = STRONG;
} }
} }