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

Handle casez without default case. 

casez statements without default cases can get their input from
the context. This handles that situation properly.
This commit is contained in:
Stephen Williams 2014-07-19 17:22:33 -07:00
parent 7b10570e11
commit 714795709c
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
synth2.cc
View File

@ -527,6 +527,19 @@ bool NetCase::synth_async_casez_(Design*des, NetScope*scope,
ivl_assert(*this, nex_map.size() == nex_out.pin_count());
if (debug_synth2) {
for (unsigned idx = 0 ; idx < nex_out.pin_count() ; idx += 1) {
cerr << get_fileline() << ": NetCase::synth_async_casez_: "
<< "nex_out.pin(" << idx << "):" << endl;
nex_out.pin(idx).dump_link(cerr, 8);
}
for (unsigned idx = 0 ; idx < accumulated_nex_out.pin_count() ; idx += 1) {
cerr << get_fileline() << ": NetCase::synth_async_casez_: "
<< "accumulated_nex_out.pin(" << idx << "):" << endl;
accumulated_nex_out.pin(idx).dump_link(cerr, 8);
}
}
vector<unsigned>mux_width (nex_out.pin_count());
for (unsigned idx = 0 ; idx < nex_out.pin_count() ; idx += 1) {
mux_width[idx] = nex_map[idx].wid;
@ -595,7 +608,7 @@ bool NetCase::synth_async_casez_(Design*des, NetScope*scope,
}
// Process the items from last to first. We generate a
// true/false must, with the select being the comparison of
// true/false mux, with the select being the comparison of
// the case select with the guard expression. The true input
// (data1) is the current statement, and the false input is
// the result of a later statement.
@ -644,11 +657,16 @@ bool NetCase::synth_async_casez_(Design*des, NetScope*scope,
connect(mux_cur->pin_Data(1), true_bus.pin(mdx));
// If there is a previous mux, then use that as the
// false clause input. Otherwise, use the default.
// false clause input. Otherwise, use the
// default. But wait, if there is no default, then
// use the accumulated input.
if (mux_prev[mdx]) {
connect(mux_cur->pin_Data(0), mux_prev[mdx]->pin_Result());
} else {
} else if (default_bus.pin(mdx).is_linked()) {
connect(mux_cur->pin_Data(0), default_bus.pin(mdx));
} else {
connect(mux_cur->pin_Data(0), statement_input.pin(mdx));
}
// Make a NetNet for the result.

7
t-dll.cc
View File

@ -2079,6 +2079,13 @@ void dll_target::lpm_mux(const NetMux*net)
nex = net->pin_Data(sdx).nexus();
ivl_nexus_t tmp = nex->t_cookie();
obj->u_.mux.d[sdx] = tmp;
if (tmp == 0) {
cerr << net->get_fileline() << ": internal error: "
<< "dll_target::lpm_mux: "
<< "Missing data port " << sdx
<< " of mux " << obj->name << "." << endl;
}
ivl_assert(*net, tmp);
nexus_lpm_add(tmp, obj, 0, IVL_DR_HiZ, IVL_DR_HiZ);
}