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

Fix crashes caused bu synthesis of sqrt32.v.

This commit is contained in:
steve 2005-12-31 04:28:14 +00:00
parent def3809b3f
commit 3131fa68b7
2 changed files with 64 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
netlist.h
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ifdef HAVE_CVS_IDENT #ifdef HAVE_CVS_IDENT
#ident "$Id: netlist.h,v 1.321.2.6 2005/12/14 00:54:29 steve Exp $" #ident "$Id: netlist.h,v 1.321.2.7 2005/12/31 04:28:14 steve Exp $"
#endif #endif
/* /*
@ -1359,7 +1359,13 @@ class NetProc : public virtual LineInfo {
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
NetNet*accum_in); NetNet*accum_in);
virtual bool synth_sync(Design*des, NetScope*scope, NetFF*ff, // Synthesize synchronous logic, and return true. The nex_out
// is where outputs are actually connected, and the nex_map
// maps nexa to bit positions. The ff is the initial DFF that
// was created to receive the Data inputs. The method *may*
// delete that DFF in favor of multiple smaller devices, but
// in that case it will set the ff argument to nil.
virtual bool synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events); const svector<NetEvProbe*>&events);
@ -1564,7 +1570,7 @@ class NetBlock : public NetProc {
bool synth_async(Design*des, NetScope*scope, bool sync_flag, bool synth_async(Design*des, NetScope*scope, bool sync_flag,
NetNet*nex_map, NetNet*nex_out); NetNet*nex_map, NetNet*nex_out);
bool synth_sync(Design*des, NetScope*scope, NetFF*ff, bool synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events); const svector<NetEvProbe*>&events);
@ -1705,7 +1711,7 @@ class NetCondit : public NetProc {
bool synth_async(Design*des, NetScope*scope, bool sync_flag, bool synth_async(Design*des, NetScope*scope, bool sync_flag,
NetNet*nex_map, NetNet*nex_out, NetNet*accum); NetNet*nex_map, NetNet*nex_out, NetNet*accum);
bool synth_sync(Design*des, NetScope*scope, NetFF*ff, bool synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events); const svector<NetEvProbe*>&events);
@ -1930,7 +1936,7 @@ class NetEvWait : public NetProc {
virtual bool synth_async(Design*des, NetScope*scope, bool sync_flag, virtual bool synth_async(Design*des, NetScope*scope, bool sync_flag,
NetNet*nex_map, NetNet*nex_out); NetNet*nex_map, NetNet*nex_out);
virtual bool synth_sync(Design*des, NetScope*scope, NetFF*ff, virtual bool synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events); const svector<NetEvProbe*>&events);
@ -3373,6 +3379,9 @@ extern ostream& operator << (ostream&, NetNet::Type);
/* /*
* $Log: netlist.h,v $ * $Log: netlist.h,v $
* Revision 1.321.2.7 2005/12/31 04:28:14 steve
* Fix crashes caused bu synthesis of sqrt32.v.
*
* Revision 1.321.2.6 2005/12/14 00:54:29 steve * Revision 1.321.2.6 2005/12/14 00:54:29 steve
* Account for sync vs async muxes. * Account for sync vs async muxes.
* *

44
synth2.cc
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#ifdef HAVE_CVS_IDENT #ifdef HAVE_CVS_IDENT
#ident "$Id: synth2.cc,v 1.39.2.12 2005/12/19 01:13:47 steve Exp $" #ident "$Id: synth2.cc,v 1.39.2.13 2005/12/31 04:28:15 steve Exp $"
#endif #endif
# include "config.h" # include "config.h"
@ -54,7 +54,7 @@ bool NetProc::synth_async(Design*des, NetScope*scope, bool sync_flag,
return synth_async(des, scope, sync_flag, nex_map, nex_out); return synth_async(des, scope, sync_flag, nex_map, nex_out);
} }
bool NetProc::synth_sync(Design*des, NetScope*scope, NetFF*ff, bool NetProc::synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events) const svector<NetEvProbe*>&events)
{ {
@ -687,7 +687,7 @@ static bool merge_ff_slices(NetFF*ff1, unsigned idx1,
* This needs to be split into a DFF bank for each statement, because * This needs to be split into a DFF bank for each statement, because
* the statements may each infer different reset and enable signals. * the statements may each infer different reset and enable signals.
*/ */
bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff, bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events_in) const svector<NetEvProbe*>&events_in)
{ {
@ -714,7 +714,6 @@ bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff,
pin_accounting[idx].proc = 0; pin_accounting[idx].proc = 0;
pin_accounting[idx].ff = 0; pin_accounting[idx].ff = 0;
} }
NetProc*cur = last_; NetProc*cur = last_;
do { do {
cur = cur->next_; cur = cur->next_;
@ -811,16 +810,18 @@ bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff,
} }
/* Now go on with the synchronous synthesis for this /* Now go on with the synchronous synthesis for this
subset of the statement. The tmp_map is the output statement of the block. The tmp_map is the output
nexa that we expect, and the tmp_out is where we want nexa that we expect, and the tmp_out is where we want
those outputs connected. */ those outputs connected. */
bool ok_flag = cur->synth_sync(des, scope, ff2, tmp_map, NetFF*ff2_tmp = ff2;
bool ok_flag = cur->synth_sync(des, scope, ff2_tmp, tmp_map,
tmp_out, events_in); tmp_out, events_in);
flag = flag && ok_flag; flag = flag && ok_flag;
if (ok_flag == false) if (ok_flag == false)
continue; continue;
if (ff2_tmp != 0) {
unsigned ff2_pins_used = ff2->width(); unsigned ff2_pins_used = ff2->width();
for (unsigned idx = 0 ; idx < ff2->width() ; idx += 1) { for (unsigned idx = 0 ; idx < ff2->width() ; idx += 1) {
unsigned ptr = find_nexus_in_set(nex_map, unsigned ptr = find_nexus_in_set(nex_map,
@ -841,6 +842,21 @@ bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff,
if (ff2_pins_used == 0) if (ff2_pins_used == 0)
delete ff2; delete ff2;
} else {
/* Oh, the cur->synth_sync deleted my ff2 DFF, so
erase any mention of it from the pin
accounting. */
for (unsigned idx = 0 ; idx < ff->width() ; idx += 1) {
if (pin_accounting[idx].ff != ff2)
continue;
pin_accounting[idx].ff = 0;
pin_accounting[idx].pin = 0;
}
ff2 = 0;
}
/* Use the nex_map to link up the output from the /* Use the nex_map to link up the output from the
substatement to the output of the block as a substatement to the output of the block as a
whole. It is occasionally possible to have outputs whole. It is occasionally possible to have outputs
@ -868,9 +884,15 @@ bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff,
if (ff2 == 0) if (ff2 == 0)
continue; continue;
if (pin >= ff2->width()) {
cerr << ff2->get_line() << ": internal error: "
<< "pin " << pin << " out of range of "
<< ff2->width() << " bit DFF." << endl;
flag = false;
/* If this block mentioned it, then the data must have /* If this block mentioned it, then the data must have
been set here. */ been set here. */
if (!ff2->pin_Data(pin).is_linked()) { } else if (!ff2->pin_Data(pin).is_linked()) {
cerr << ff2->get_line() << ": error: " cerr << ff2->get_line() << ": error: "
<< "DFF introduced here is missing Data inputs." << "DFF introduced here is missing Data inputs."
<< endl; << endl;
@ -883,6 +905,7 @@ bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff,
/* Done. The large NetFF is no longer needed, as it has been /* Done. The large NetFF is no longer needed, as it has been
taken up by the smaller NetFF devices. */ taken up by the smaller NetFF devices. */
delete ff; delete ff;
ff = 0;
return flag; return flag;
} }
@ -893,7 +916,7 @@ bool NetBlock::synth_sync(Design*des, NetScope*scope, NetFF*ff,
* asynchronous set/reset, depending on whether the pin of the * asynchronous set/reset, depending on whether the pin of the
* expression is connected to an event, or not. * expression is connected to an event, or not.
*/ */
bool NetCondit::synth_sync(Design*des, NetScope*scope, NetFF*ff, bool NetCondit::synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events_in) const svector<NetEvProbe*>&events_in)
{ {
@ -1138,7 +1161,7 @@ bool NetCondit::synth_sync(Design*des, NetScope*scope, NetFF*ff,
return flag; return flag;
} }
bool NetEvWait::synth_sync(Design*des, NetScope*scope, NetFF*ff, bool NetEvWait::synth_sync(Design*des, NetScope*scope, NetFF*&ff,
NetNet*nex_map, NetNet*nex_out, NetNet*nex_map, NetNet*nex_out,
const svector<NetEvProbe*>&events_in) const svector<NetEvProbe*>&events_in)
{ {
@ -1331,6 +1354,9 @@ void synth2(Design*des)
/* /*
* $Log: synth2.cc,v $ * $Log: synth2.cc,v $
* Revision 1.39.2.13 2005/12/31 04:28:15 steve
* Fix crashes caused bu synthesis of sqrt32.v.
*
* Revision 1.39.2.12 2005/12/19 01:13:47 steve * Revision 1.39.2.12 2005/12/19 01:13:47 steve
* Handle DFF definitions spread out within a block. * Handle DFF definitions spread out within a block.
* *