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

Add appropriate hysteresis to tranif input pins. 

The tranif input pins are normally nothing special, but sometimes
they are fed back from the switch body. In this case, the control
needs to see the current *output* from the fed back port, in order
to get the results that people expect.
(cherry picked from commit 33158355ba)

Conflicts:

	tgt-vvp/draw_net_input.c
	vvp/island_tran.cc
This commit is contained in:
Stephen Williams 2009-10-28 16:32:40 -07:00
parent cca3b0ed5a
commit f5728c4a39
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tgt-vvp/draw_net_input.c
View File

@ -570,7 +570,9 @@ char* draw_net_input_x(ivl_nexus_t nex,
ivl_nexus_ptr_t nptr = ivl_nexus_ptr(nex, idx);
/* If this object is part of an island, then we'll be
making a port. Save the island cookie. */
making a port. If this nexus is an output from any
switches in the island, then set island_input_flag to
false. Save the island cookie. */
if ( (sw = ivl_nexus_ptr_switch(nptr)) ) {
island = ivl_switch_island(sw);
}

30
vvp/island_tran.cc
View File

@ -74,22 +74,17 @@ static inline vvp_island_branch_tran* BRANCH_TRAN(vvp_island_branch*tmp)
void vvp_island_tran::run_island()
{
// Test to see if any of the branches are enabled. This loop
// tests the elabled inputs for all the branches and caches
// tests the enabled inputs for all the branches and caches
// the results in the enabled_flag for each branch. The
// run_test_enabled() method also clears all the processing
// flags for the branches so that we are in a good start
// state.
//
// If, after testing all the branches, none are enabled, the
// handle that special case by ignoring the island.
bool runnable = false;
for (vvp_island_branch*cur = branches_ ; cur ; cur = cur->next_branch) {
vvp_island_branch_tran*tmp = dynamic_cast<vvp_island_branch_tran*>(cur);
assert(tmp);
runnable |= tmp->run_test_enabled();
}
if (runnable == false)
return;
// Now resolve all the branches in the island.
for (vvp_island_branch*cur = branches_ ; cur ; cur = cur->next_branch) {
@ -113,8 +108,29 @@ bool vvp_island_branch_tran::run_test_enabled()
return true;
}
// Get the input that is driving this enable.
// SPECIAL NOTE: Try to get the input value from the
// *outvalue* of the port. If the enable is connected to a
// .port (instead of a .import) then there may be feedback
// going on, and we need to be looking at the resolved input,
// not the event input. For example:
//
// tranif1 (pin, X, pin);
//
// In this case, when we test the value for "pin", we need to
// look at the value that is resolved from this
// island. Reading the outvalue will do the trick.
//
// If the outvalue is nil, then we know that this port is a
// .import after all, so just read the invalue.
enabled_flag = false;
vvp_bit4_t enable_val = ep->invalue.value(0).value();
vvp_bit4_t enable_val;
if (ep->outvalue.size() != 0)
enable_val = ep->outvalue.value(0).value();
else if (ep->invalue.size() == 0)
enable_val = BIT4_Z;
else
enable_val = ep->invalue.value(0).value();
if (active_high==true && enable_val != BIT4_1)
return false;